cleanup prior changeset, ease -dev merge.

bk: 4be66e64iE5hzQJqlEcGOdwJVRzhlg

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index c2a8c36851a71366dc779a01b0b2362c2f58e2ac..54d2fb6336495c84eb926b94da02f3fb0679125d 100644 (file)
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1429,7 +1429,6 @@ doprintpeers(
 {
        char *name;
        char *value = NULL;
-       size_t len;
        int i;
        int c;
 
@@ -1437,6 +1436,7 @@ doprintpeers(
        sockaddr_u dstadr;
        u_long srcport = 0;
        char *dstadr_refid = "0.0.0.0";
+       size_t drlen;
        u_long stratum = 0;
        long ppoll = 0;
        long hpoll = 0;
@@ -1493,8 +1493,8 @@ doprintpeers(
                        if (pvl == peervarlist) {
                                havevar[HAVE_REFID] = 1;
                                if (*value == '\0') {
-                                       dstadr_refid = "0.0.0.0";
-                               } else if ((i = (int)strlen(value)) <= 4) {
+                                       dstadr_refid = "";
+                               } else if (strlen(value) <= 4) {
                                        refid_string[0] = '.';
                                        (void) strcpy(&refid_string[1], value);
                                        i = strlen(refid_string);
@@ -1589,12 +1589,12 @@ doprintpeers(
                c = flash2[CTL_PEER_STATVAL(rstatus) & 0x3];
        if (numhosts > 1)
                fprintf(fp, "%-*s ", maxhostlen, currenthost);
-       if (af == 0 || AF(&srcadr) == af) {
+       if (AF_UNSPEC == af || AF(&srcadr) == af) {
                strncpy(clock_name, nntohost(&srcadr), sizeof(clock_name));             
                fprintf(fp, "%c%-15.15s ", c, clock_name);
-               len = strlen(dstadr_refid);
-               makeascii(len, dstadr_refid, fp);
-               while (len++ < 15)
+               drlen = strlen(dstadr_refid);
+               makeascii(drlen, dstadr_refid, fp);
+               while (drlen++ < 15)
                        fputc(' ', fp);
                fprintf(fp,
                        " %2ld %c %4.4s %4.4s  %3lo  %7.7s %8.7s %7.7s\n",

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 8846f14eddf74c0898e485425a6178767e4ebc01..947ddd9d3936ae0e38436eb92b264f78e0ab45c6 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -2747,7 +2747,7 @@ do {                                                      \
 void
 makeascii(
        int length,
-       char *data,
+       const char *data,
        FILE *fp
        )
 {

diff --git a/ntpq/ntpq.h b/ntpq/ntpq.h
index f267e25fa01e6ff5b02911df1fcc55b35dfb281c..e5ca4edc7de434ec09bcff5d2947e54d4c7059ef 100644 (file)
--- a/ntpq/ntpq.h
+++ b/ntpq/ntpq.h
@@ -94,4 +94,4 @@ extern        int     decodetime      (char *, l_fp *);
 extern void    printvars       (int, char *, int, int, int, FILE *);
 extern int     decodeint       (char *, long *);
 extern int     findvar         (char *, struct ctl_var *, int code);
-extern void    makeascii       (int, char *, FILE *);
+extern void    makeascii       (int, const char *, FILE *);