Many files:

  * util/hist.c:
  * ntptrace/ntptrace.c:
  * ntpq/ntpq.c:
  * ntpdc/ntpdc.c:
  * ntpdate/ntptimeset.c:
  * ntpdate/ntpdate.c:
  * ntpd/refclock_parse.c:
  * ntpd/refclock_msfees.c:
  * ntpd/refclock_jupiter.c:
  * ntpd/ntp_refclock.c:
  * ntpd/ntp_io.c:
  * libparse/clk_wharton.c:
  * libparse/clk_varitext.c:
  * libparse/clk_trimtaip.c:
  * libparse/clk_schmid.c:
  * libparse/clk_rcc8000.c:
  * libparse/clk_rawdcf.c:
  * libparse/clk_meinberg.c:
  * libparse/clk_hopf6021.c:
  * libparse/clk_dcf7000.c:
  * libparse/clk_computime.c:
  Lint.  From: Simon Burge <simonb@wasabisystems.com>

bk: 3ae2a987_Any0L1_wxk91kE-OkOQ3A

diff --git a/ChangeLog b/ChangeLog
index b666598932dae8d4d5e5007a17674f33f6e539c9..48aa9e567fdc7875b951e986e3b061cd51a68790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2001-04-22  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * util/hist.c:
+       * ntptrace/ntptrace.c:
+       * ntpq/ntpq.c:
+       * ntpdc/ntpdc.c:
+       * ntpdate/ntptimeset.c:
+       * ntpdate/ntpdate.c:
+       * ntpd/refclock_parse.c:
+       * ntpd/refclock_msfees.c:
+       * ntpd/refclock_jupiter.c:
+       * ntpd/ntp_refclock.c:
+       * ntpd/ntp_io.c:
+       * libparse/clk_wharton.c:
+       * libparse/clk_varitext.c:
+       * libparse/clk_trimtaip.c:
+       * libparse/clk_schmid.c:
+       * libparse/clk_rcc8000.c:
+       * libparse/clk_rawdcf.c:
+       * libparse/clk_meinberg.c:
+       * libparse/clk_hopf6021.c:
+       * libparse/clk_dcf7000.c:
+       * libparse/clk_computime.c:
+       Lint.  From: Simon Burge <simonb@wasabisystems.com>
+
 2001-04-21  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * ntpd/refclock_nmea.c (nmea_receive): Fixes.

diff --git a/libparse/clk_computime.c b/libparse/clk_computime.c
index 5a155cf35f76c807077b2ddc01af0713e2681abf..3312b3f1b077fa062ca8567e66c473e051a2c846 100644 (file)
--- a/libparse/clk_computime.c
+++ b/libparse/clk_computime.c
@@ -137,7 +137,7 @@ inp_computime(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_computime(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_computime(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_dcf7000.c b/libparse/clk_dcf7000.c
index e815e9d324842751148e56e67baa93565dbe8aab..30506c5fcd7af3396c718bbae8b4870b2b600f43 100644 (file)
--- a/libparse/clk_dcf7000.c
+++ b/libparse/clk_dcf7000.c
@@ -137,7 +137,7 @@ inp_dcf7000(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_dcf7000(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_dcf7000(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_hopf6021.c b/libparse/clk_hopf6021.c
index cd1e821851e123383fbf34d710e3194baa348b1f..b2d53cd364fe32d6ed6b13dd9b8c10d8b5b25545 100644 (file)
--- a/libparse/clk_hopf6021.c
+++ b/libparse/clk_hopf6021.c
@@ -226,7 +226,7 @@ inp_hopf6021(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_hopf6021(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_hopf6021(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_meinberg.c b/libparse/clk_meinberg.c
index 504ddf14efe14632740eeac7e674ec052ea00ea5..87c7fdeb1dc7869df4a4ab4362f96f702d308d35 100644 (file)
--- a/libparse/clk_meinberg.c
+++ b/libparse/clk_meinberg.c
@@ -409,7 +409,7 @@ mbg_input(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("mbg_input(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("mbg_input(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {
@@ -577,7 +577,7 @@ gps_input(
   
   msg_buf = (struct msg_buf *)parseio->parse_pdata;
 
-  parseprintf(DD_PARSE, ("gps_input(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+  parseprintf(DD_PARSE, ("gps_input(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
 
   if (!msg_buf)
     return PARSE_INP_SKIP;

diff --git a/libparse/clk_rawdcf.c b/libparse/clk_rawdcf.c
index 65592ce45a4548e429028ed78b57b723da100348..40ec8ad1348a584f9ceea9bdf51bc59925256ba3 100644 (file)
--- a/libparse/clk_rawdcf.c
+++ b/libparse/clk_rawdcf.c
@@ -546,7 +546,7 @@ inp_rawdcf(
 {
        static struct timeval timeout = { 1, 500000 }; /* 1.5 secongs denote second #60 */
        
-       parseprintf(DD_PARSE, ("inp_rawdcf(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_rawdcf(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        parseio->parse_dtime.parse_stime = *tstamp; /* collect timestamp */
 

diff --git a/libparse/clk_rcc8000.c b/libparse/clk_rcc8000.c
index 863e5d4655f7cbd25581a8d32ba11cad59ec4ccc..23e676359b6bba3e3c9b28014abcfa6ecef01542 100644 (file)
--- a/libparse/clk_rcc8000.c
+++ b/libparse/clk_rcc8000.c
@@ -140,7 +140,7 @@ inp_rcc8000(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_rcc8000(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_rcc8000(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_schmid.c b/libparse/clk_schmid.c
index 8a0beaf6739d5e771c3515916cd483c20874b27e..52c0ef4d0c3eb60a70e5fc88f7d33883cf910973 100644 (file)
--- a/libparse/clk_schmid.c
+++ b/libparse/clk_schmid.c
@@ -184,7 +184,7 @@ inp_schmid(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_schmid(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_schmid(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_trimtaip.c b/libparse/clk_trimtaip.c
index 21b8420869c800d10a75e9cc44cd0343a42044d5..4453e2b5063b9c250e4704bf76e0414918a22726 100644 (file)
--- a/libparse/clk_trimtaip.c
+++ b/libparse/clk_trimtaip.c
@@ -126,7 +126,7 @@ inp_trimtaip(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_trimtaip(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_trimtaip(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/libparse/clk_varitext.c b/libparse/clk_varitext.c
index c5c9059b60eefac173da4950c580ccc062339250..8019e0ea380581743ae47afa867b8e84e753bc59 100644 (file)
--- a/libparse/clk_varitext.c
+++ b/libparse/clk_varitext.c
@@ -169,7 +169,7 @@ inp_varitext(
   struct varitext *t = (struct varitext *)parseio->parse_pdata;
   int    rtc;
 
-  parseprintf(DD_PARSE, ("inp_varitext(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+  parseprintf(DD_PARSE, ("inp_varitext(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
 
   if (!t) 
     return PARSE_INP_SKIP;     /* local data not allocated - sigh! */

diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c
index 7296f9aa3758dc193572b86aa9408511bc6ac3f3..6dfc971d18629063fec9641b601520711e8a9de9 100644 (file)
--- a/libparse/clk_wharton.c
+++ b/libparse/clk_wharton.c
@@ -134,7 +134,7 @@ inp_wharton_400a(
 {
        unsigned int rtc;
        
-       parseprintf(DD_PARSE, ("inp_wharton_400a(0x%x, 0x%x, ...)\n", (int)parseio, (int)ch));
+       parseprintf(DD_PARSE, ("inp_wharton_400a(0x%lx, 0x%x, ...)\n", (long)parseio, ch));
        
        switch (ch)
        {

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 48514fb02cb04c8bd8f77a5f5a3811cf03064849..23c0cb735e084ee0266ee414f000dbd450c7a119 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1161,7 +1161,7 @@ sendpkt(
         err = io_completion_port_sendto(inter, pkt, len, dest);
        if (err != ERROR_SUCCESS)
 #else
-       cc = sendto(inter->fd, (char *)pkt, len, 0, (struct sockaddr *)dest,
+       cc = sendto(inter->fd, (char *)pkt, (size_t)len, 0, (struct sockaddr *)dest,
                    sizeof(struct sockaddr_in));
        if (cc == -1)
 #endif

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 7a112e90e85ac1418431d55a0642765ea6b205e2..e8eb5f91ce2bd533dd17953e4450d1d64d18c102 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -480,7 +480,7 @@ refclock_sample(
        while (pp->codeproc != pp->coderecv)
                off[n++] = pp->filter[pp->codeproc++ % MAXSTAGE];
        if (n > 1)
-               qsort((char *)off, n, sizeof(double), refclock_cmpl_fp);
+               qsort((char *)off, (size_t)n, sizeof(double), refclock_cmpl_fp);
 
        /*
         * Reject the furthest from the median of the samples until

diff --git a/ntpd/refclock_jupiter.c b/ntpd/refclock_jupiter.c
index 483984cceb3413451b876e729d1e23886bacc005..4d1d4c24dbd22920e4e6a8965c3f4408e0bc4d8c 100644 (file)
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -680,7 +680,7 @@ jupiter_process(register struct peer *peer)
         */
        for (i = 0; i < NSAMPLES; i++)
                off[i] = up->filter[i];
-       qsort((char *)off, NSAMPLES, sizeof(l_fp), jupiter_cmpl_fp);
+       qsort((char *)off, (size_t)NSAMPLES, sizeof(l_fp), jupiter_cmpl_fp);
 
        /*
         * Reject the furthest from the median of NSAMPLES samples until

diff --git a/ntpd/refclock_msfees.c b/ntpd/refclock_msfees.c
index dd1c06db16b7d13f8658c932f883c046f3bc7b9c..b1aaa5658f91a946d48be0eb1da7bae0920cc56a 100644 (file)
--- a/ntpd/refclock_msfees.c
+++ b/ntpd/refclock_msfees.c
@@ -1284,7 +1284,7 @@ ees_process(
        if (ees->dump_vals) dump_buf(coffs, 0, samples, "Raw  data  is:");
 
        /* Sort the offsets, trim off the extremes, then choose one. */
-       qsort((char *) coffs, (u_int)samples, sizeof(l_fp), offcompare);
+       qsort((char *) coffs, (size_t)samples, sizeof(l_fp), offcompare);
 
        noff = samples;
        i = 0;

diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index ed44683e45cbfde22e0a82742c9102b5b46e1f41..cfb9904e310502599ef045d847f6247e920d38c5 100644 (file)
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -5163,9 +5163,9 @@ rawdcf_init_1(
        }
 
 #ifdef TIOCM_DTR
-       sl232 = sl232 & ~TIOCM_RTS | TIOCM_DTR; /* turn on DTR, clear RTS for power supply */
+       sl232 = (sl232 & ~TIOCM_RTS) | TIOCM_DTR;       /* turn on DTR, clear RTS for power supply */
 #else
-       sl232 = sl232 & ~CIOCM_RTS | CIOCM_DTR; /* turn on DTR, clear RTS for power supply */
+       sl232 = (sl232 & ~CIOCM_RTS) | CIOCM_DTR;       /* turn on DTR, clear RTS for power supply */
 #endif
 
        if (ioctl(parse->generic->io.fd, TIOCMSET, (caddr_t)&sl232) == -1)
@@ -5210,9 +5210,9 @@ rawdcf_init_2(
        }
 
 #ifdef TIOCM_RTS
-       sl232 = sl232 & ~TIOCM_DTR | TIOCM_RTS; /* turn on RTS, clear DTR for power supply */
+       sl232 = (sl232 & ~TIOCM_DTR) | TIOCM_RTS;       /* turn on RTS, clear DTR for power supply */
 #else
-       sl232 = sl232 & ~CIOCM_DTR | CIOCM_RTS; /* turn on RTS, clear DTR for power supply */
+       sl232 = (sl232 & ~CIOCM_DTR) | CIOCM_RTS;       /* turn on RTS, clear DTR for power supply */
 #endif
 
        if (ioctl(parse->generic->io.fd, TIOCMSET, (caddr_t)&sl232) == -1)

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 43813684c718cf4313cb2e6ce13e02c478bdf4e8..b01d539806e44233d99dfaf58144375b3920edb9 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -1654,7 +1654,7 @@ sendpkt(
        DWORD err;
 #endif /* SYS_WINNT */
 
-       cc = sendto(fd, (char *)pkt, len, 0, (struct sockaddr *)dest,
+       cc = sendto(fd, (char *)pkt, (size_t)len, 0, (struct sockaddr *)dest,
                        sizeof(struct sockaddr_in));
 #ifndef SYS_WINNT
        if (cc == -1) {

diff --git a/ntpdate/ntptimeset.c b/ntpdate/ntptimeset.c
index 0077b009a12b84e32cd14113d35d3fad18859160..95b70b690caf8262709d5e7be3efce3336f78208 100644 (file)
--- a/ntpdate/ntptimeset.c
+++ b/ntpdate/ntptimeset.c
@@ -1969,7 +1969,7 @@ sendpkt(
        }
 
 
-       cc = sendto(fd, (char *)pkt, len, 0, (struct sockaddr *)dest,
+       cc = sendto(fd, (char *)pkt, (size_t)len, 0, (struct sockaddr *)dest,
            sizeof(struct sockaddr_in));
 #ifndef SYS_WINNT
        if (cc == -1) {

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 51543ece3b3359c8f8ce84165befd6600dfc8e0c..09ba6333c847e35226d9e09ca2a1ae92b2d78d73 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -488,7 +488,7 @@ sendpkt(
        int xdatalen
        )
 {
-       if (send(sockfd, xdata, xdatalen, 0) == -1) {
+       if (send(sockfd, xdata, (size_t)xdatalen, 0) == -1) {
                warning("write to %s failed", currenthost, "");
                return -1;
        }
@@ -1298,9 +1298,9 @@ help(
                    cmdsort[n++] = xcp->keyword;
 
 #ifdef QSORT_USES_VOID_P
-               qsort(cmdsort, n, sizeof(char *), helpsort);
+               qsort(cmdsort, (size_t)n, sizeof(char *), helpsort);
 #else
-               qsort((char *)cmdsort, n, sizeof(char *), helpsort);
+               qsort((char *)cmdsort, (size_t)n, sizeof(char *), helpsort);
 #endif
 
                maxlength = 0;

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 52815f5d70e45f9780bcf8f68df4d680d6c8031a..53faab48c10d85287dee618bd2db5bb7f876a3e4 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -670,7 +670,7 @@ sendpkt(
            printf("Sending %d octets\n", xdatalen);
 
 
-       if (send(sockfd, xdata, xdatalen, 0) == -1) {
+       if (send(sockfd, xdata, (size_t)xdatalen, 0) == -1) {
                warning("write to %s failed", currenthost, "");
                return -1;
        }
@@ -1907,9 +1907,9 @@ help(
                    cmdsort[n++] = xcp->keyword;
 
 #ifdef QSORT_USES_VOID_P
-               qsort(cmdsort, (unsigned)n, sizeof(char *), helpsort);
+               qsort(cmdsort, (size_t)n, sizeof(char *), helpsort);
 #else
-               qsort((char *)cmdsort, n, sizeof(char *), helpsort);
+               qsort((char *)cmdsort, (size_t)n, sizeof(char *), helpsort);
 #endif
 
                maxlength = 0;
@@ -3058,7 +3058,7 @@ sortassoc(void)
 #else
                    (char *)
 #endif
-                   assoc_cache, (unsigned)numassoc,
+                   assoc_cache, (size_t)numassoc,
                    sizeof(struct association), assoccmp);
 }
 

diff --git a/ntptrace/ntptrace.c b/ntptrace/ntptrace.c
index 6fd9ed7b2d9d81c39cc72c43e2a7ee87392edc07..f7106ba2f1957f5fb78631c7ea973861f15152ba 100644 (file)
--- a/ntptrace/ntptrace.c
+++ b/ntptrace/ntptrace.c
@@ -618,7 +618,7 @@ sendpkt(
 {
        int cc;
 
-       cc = sendto(fd, (char *)pkt, len, 0, (struct sockaddr *)dest,
+       cc = sendto(fd, (char *)pkt, (size_t)len, 0, (struct sockaddr *)dest,
                    sizeof(struct sockaddr_in));
        if (cc == -1) {
 #ifndef SYS_WINNT

diff --git a/util/hist.c b/util/hist.c
index 5b11ff185193756a28fb79bff456b3669bf4de64..b02d73fdd7d9224b08fae8b728084cf8209774f8 100644 (file)
--- a/util/hist.c
+++ b/util/hist.c
@@ -79,7 +79,7 @@ main(
        }
        if (n == 0)
            return;
-       qsort((char *)ovfl, (int)n, sizeof(long), col);
+       qsort((char *)ovfl, (size_t)n, sizeof(long), col);
        w = 0;
        j = 0;
        for (i = 0; i < n; i++) {