Fixes to deal with compiler warnings.

bk: 3eab1561vJLaoEgiXL9S3DLTc59KIw

diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 1c0625a38f8e6d878fbe3c16be81b34e2ac12daa..b3d77ea14e5874fc88a09b4fea38596a857e90ee 100644 (file)
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -3655,7 +3655,7 @@ crypto_tai(
                        continue;
                if (sscanf(buf, "%u %u", &leapsec[i], &offset) != 2)
                        continue;
-               if (i != offset - TAI_1972) { 
+               if (i != (int)(offset - TAI_1972)) { 
                        break;
                }
                i++;

diff --git a/ntpq/ntpq_ops.c b/ntpq/ntpq_ops.c
index 84e79d4c00fa9ec564b09a53376e197dfb172b8a..8b71407e6538fad0828732dfaee5b6b83ea920e6 100644 (file)
--- a/ntpq/ntpq_ops.c
+++ b/ntpq/ntpq_ops.c
@@ -932,7 +932,7 @@ printassoc(
        (void) fprintf(fp,
                           "===========================================================\n");
        for (i = 0; i < numassoc; i++) {
-               statval = CTL_PEER_STATVAL(assoc_cache[i].status);
+               statval = (u_char) CTL_PEER_STATVAL(assoc_cache[i].status);
                if (!showall && !(statval & (CTL_PST_CONFIG|CTL_PST_REACH)))
                        continue;
                event = CTL_PEER_EVENT(assoc_cache[i].status);
@@ -1339,12 +1339,12 @@ doprintpeers(
 
        struct sockaddr_storage srcadr;
        struct sockaddr_storage dstadr;
-       u_long srcport;
+       u_long srcport = 0;
        char *dstadr_refid = "0.0.0.0";
-       u_long stratum;
-       long ppoll;
-       long hpoll;
-       u_long reach;
+       u_long stratum = 0;
+       long ppoll = 0;
+       long hpoll = 0;
+       u_long reach = 0;
        l_fp estoffset;
        l_fp estdelay;
        l_fp estjitter;
@@ -1365,6 +1365,12 @@ doprintpeers(
        memset((char *)&srcadr, 0, sizeof(struct sockaddr_storage));
        memset((char *)&dstadr, 0, sizeof(struct sockaddr_storage));
 
+       /* Initialize by zeroing out estimate variables */
+       memset((char *)&estoffset, 0, sizeof(l_fp));
+       memset((char *)&estdelay, 0, sizeof(l_fp));
+       memset((char *)&estjitter, 0, sizeof(l_fp));
+       memset((char *)&estdisp, 0, sizeof(l_fp));
+
        while (nextvar(&datalen, &data, &name, &value)) {
                struct sockaddr_storage dum_store;