silence compiler warnings

diff --git a/lib/bind/dst/md5_dgst.c b/lib/bind/dst/md5_dgst.c
index 340b6a5d0d109397a0fc3f8000cc176b3811a53a..48c327eac349ef09da9a56f32f71b859c6bdbd4e 100644 (file)
--- a/lib/bind/dst/md5_dgst.c
+++ b/lib/bind/dst/md5_dgst.c
@@ -115,7 +115,7 @@ unsigned long len;
                sw=c->num>>2;
                sc=c->num&0x03;
 
-               if ((c->num+len) >= MD5_CBLOCK)
+               if ((c->num+len) >= (size_t)MD5_CBLOCK)
                        {
                        l= p[sw];
                        p_c2l(data,l,sc);
@@ -163,7 +163,7 @@ unsigned long len;
        /* we now can process the input data in blocks of MD5_CBLOCK
         * chars and save the leftovers to c->data. */
        p=c->data;
-       while (len >= MD5_CBLOCK)
+       while (len >= (size_t)MD5_CBLOCK)
                {
 #if defined(L_ENDIAN) || defined(B_ENDIAN)
                memcpy(p,data,MD5_CBLOCK);

diff --git a/lib/bind/dst/md5_locl.h b/lib/bind/dst/md5_locl.h
index b2f0028fbd368bfc147332f861c30ebdc1df4005..ce4c765c1b838e5460b2a5d66027345b0d14e6c9 100644 (file)
--- a/lib/bind/dst/md5_locl.h
+++ b/lib/bind/dst/md5_locl.h
@@ -101,9 +101,9 @@
                        switch (sc) \
                                { \
                        case 0: l =((unsigned long)(*((c)++))); \
-                               if (--len == 0) break; \
+                               if (--len == 0U) break; \
                        case 1: l|=((unsigned long)(*((c)++)))<< 8; \
-                               if (--len == 0) break; \
+                               if (--len == 0U) break; \
                        case 2: l|=((unsigned long)(*((c)++)))<<16; \
                                } \
                        }

diff --git a/lib/bind/irs/gen_ho.c b/lib/bind/irs/gen_ho.c
index eff32c24c4c0b31360450663306b387bc693f0de..eaad3313d1b2c647b6393b9f49ab03bd5d623cda 100644 (file)
--- a/lib/bind/irs/gen_ho.c
+++ b/lib/bind/irs/gen_ho.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gen_ho.c,v 1.1.2.1 2004/03/09 09:17:28 marka Exp $";
+static const char rcsid[] = "$Id: gen_ho.c,v 1.1.2.2 2004/03/17 01:54:19 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports */
@@ -383,7 +383,7 @@ init(struct irs_ho *this) {
         if (!pvt->res && !ho_res_get(this))
                 return (-1);
 
-        if (((pvt->res->options & RES_INIT) == 0) &&
+        if (((pvt->res->options & RES_INIT) == 0U) &&
             (res_ninit(pvt->res) == -1))
                 return (-1);
 

diff --git a/lib/bind/irs/gen_nw.c b/lib/bind/irs/gen_nw.c
index 23f48b0aac259a9fab4dd1f2339a8c4205430eb0..96f4be59903834e66f59ae64e5135c2b3bb728fd 100644 (file)
--- a/lib/bind/irs/gen_nw.c
+++ b/lib/bind/irs/gen_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gen_nw.c,v 1.1.2.1 2004/03/09 09:17:29 marka Exp $";
+static const char rcsid[] = "$Id: gen_nw.c,v 1.1.2.2 2004/03/17 01:54:20 marka Exp $";
 #endif
 
 /* Imports */
@@ -255,7 +255,7 @@ init(struct irs_nw *this) {
        
        if (!pvt->res && !nw_res_get(this))
                return (-1);
-       if (((pvt->res->options & RES_INIT) == 0) &&
+       if (((pvt->res->options & RES_INIT) == 0U) &&
            res_ninit(pvt->res) == -1)
                return (-1);
        return (0);

diff --git a/lib/bind/irs/gethostent.c b/lib/bind/irs/gethostent.c
index 0db30ea0cd2ce331fd321a42c05049c303f0d079..7173511005d700ebae699205125102dad022b329 100644 (file)
--- a/lib/bind/irs/gethostent.c
+++ b/lib/bind/irs/gethostent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.3 2004/03/09 09:17:30 marka Exp $";
+static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.4 2004/03/17 01:54:20 marka Exp $";
 #endif
 
 /* Imports */
@@ -187,7 +187,7 @@ gethostent_p(struct net_data *net_data) {
                return (NULL);
        while ((hp = (*ho->next)(ho)) != NULL &&
               hp->h_addrtype == AF_INET6 &&
-              (net_data->res->options & RES_USE_INET6) == 0)
+              (net_data->res->options & RES_USE_INET6) == 0U)
                continue;
        net_data->ho_last = hp;
        return (net_data->ho_last);
@@ -356,13 +356,13 @@ getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
                
        switch (af) {
        case AF_INET:
-               if (len != INADDRSZ) {
+               if (len != (size_t)INADDRSZ) {
                        *error_num = NO_RECOVERY;
                        return (NULL);
                }
                break;
        case AF_INET6:
-               if (len != IN6ADDRSZ) {
+               if (len != (size_t)IN6ADDRSZ) {
                        *error_num = NO_RECOVERY;
                        return (NULL);
                }
@@ -1007,7 +1007,7 @@ fakeaddr(const char *name, int af, struct net_data *net_data) {
        }
        strncpy(pvt->name, name, NS_MAXDNAME);
        pvt->name[NS_MAXDNAME] = '\0';
-       if (af == AF_INET && (net_data->res->options & RES_USE_INET6) != 0) {
+       if (af == AF_INET && (net_data->res->options & RES_USE_INET6) != 0U) {
                map_v4v6_address(pvt->addr, pvt->addr);
                af = AF_INET6;
        }

diff --git a/lib/bind/irs/getnameinfo.c b/lib/bind/irs/getnameinfo.c
index 702b932bf39af06a2031079848474386c20b6a55..dd8c14b46b2f20f813cdd6feb800b016d5b4ca59 100644 (file)
--- a/lib/bind/irs/getnameinfo.c
+++ b/lib/bind/irs/getnameinfo.c
@@ -132,7 +132,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
        port = ((const struct sockinet *)sa)->si_port; /* network byte order */
        addr = (const char *)sa + afd->a_off;
 
-       if (serv == NULL || servlen == 0) {
+       if (serv == NULL || servlen == 0U) {
                /*
                 * rfc2553bis says that serv == NULL or servlen == 0 means that
                 * the caller does not want the result.
@@ -177,7 +177,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                }
                break;
        }
-       if (host == NULL || hostlen == 0) {
+       if (host == NULL || hostlen == 0U) {
                /*
                 * rfc2553bis says that host == NULL or hostlen == 0 means that
                 * the caller does not want the result.
@@ -283,7 +283,7 @@ ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf,
 #ifdef NI_NUMERICSCOPE
        if (flags & NI_NUMERICSCOPE) {
                sprintf(tmp, "%u", sa6->sin6_scope_id);
-               if (bufsiz != 0) {
+               if (bufsiz != 0U) {
                        strncpy(buf, tmp, bufsiz - 1);
                        buf[bufsiz - 1] = '\0';
                }
@@ -313,7 +313,7 @@ ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf,
 
        /* last resort */
        sprintf(tmp, "%u", sa6->sin6_scope_id);
-       if (bufsiz != 0) {
+       if (bufsiz != 0U) {
                strncpy(buf, tmp, bufsiz - 1);
                buf[bufsiz - 1] = '\0';
        }

diff --git a/lib/bind/irs/getnetent.c b/lib/bind/irs/getnetent.c
index 4d02916bee4379ddf0bbe8b94147ad82879b2fb7..6be115edae2ee6e11352d5efa39ef3e2a1e15886 100644 (file)
--- a/lib/bind/irs/getnetent.c
+++ b/lib/bind/irs/getnetent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: getnetent.c,v 1.4.2.1 2004/03/09 09:17:30 marka Exp $";
+static const char rcsid[] = "$Id: getnetent.c,v 1.4.2.2 2004/03/17 01:54:21 marka Exp $";
 #endif
 
 /* Imports */
@@ -156,13 +156,13 @@ getnetbyaddr_p(unsigned long net, int type, struct net_data *net_data) {
                        return (net_data->nw_last);
 
        /* cannonize net(host order) */
-       if (net < 256) {
+       if (net < 256UL) {
                net <<= 24;
                bits = 8;
-       } else if (net < 65536) {
+       } else if (net < 65536UL) {
                net <<= 16;
                bits = 16;
-       } else if (net < 16777216) {
+       } else if (net < 16777216UL) {
                net <<= 8;
                bits = 24;
        } else

diff --git a/lib/bind/irs/hesiod.c b/lib/bind/irs/hesiod.c
index f156c84da046bfff7cb923169359d01b685d47b9..2f8e2822c33fd5028eac7f02a70516f32e55f8b5 100644 (file)
--- a/lib/bind/irs/hesiod.c
+++ b/lib/bind/irs/hesiod.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: hesiod.c,v 1.1.2.2 2004/03/09 09:17:31 marka Exp $";
+static const char rcsid[] = "$Id: hesiod.c,v 1.1.2.3 2004/03/17 01:54:21 marka Exp $";
 #endif
 
 /*
@@ -516,7 +516,7 @@ init(struct hesiod_p *ctx) {
        if (!ctx->res && !__hesiod_res_get(ctx))
                return (-1);
 
-       if (((ctx->res->options & RES_INIT) == 0) &&
+       if (((ctx->res->options & RES_INIT) == 0U) &&
            (res_ninit(ctx->res) == -1))
                return (-1);
 

diff --git a/lib/bind/irs/irp.c b/lib/bind/irs/irp.c
index 8d3bd88e2a158d136b4b4de467e50589a7220d15..9c73310684df2b77fe4963b337b4d4bcb50a3aa2 100644 (file)
--- a/lib/bind/irs/irp.c
+++ b/lib/bind/irs/irp.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irp.c,v 1.3.2.2 2004/03/09 09:17:31 marka Exp $";
+static const char rcsid[] = "$Id: irp.c,v 1.3.2.3 2004/03/17 01:54:21 marka Exp $";
 #endif
 
 /* Imports */
@@ -387,7 +387,7 @@ irs_irp_read_response(struct irp_p *pvt, char *text, size_t textlen) {
 
        if (sscanf(line, "%d", &code) != 1) {
                code = 0;
-       } else if (text != NULL && textlen > 0) {
+       } else if (text != NULL && textlen > 0U) {
                p = line;
                while (isspace((unsigned char)*p)) p++;
                while (isdigit((unsigned char)*p)) p++;

diff --git a/lib/bind/isc/ev_timers.c b/lib/bind/isc/ev_timers.c
index 1c5e312c3c5cea5f042d79b4a965c629c6d804ec..95e632ba0a7fd0333632d73bb2951baffe219947 100644 (file)
--- a/lib/bind/isc/ev_timers.c
+++ b/lib/bind/isc/ev_timers.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.2.2.4 2004/03/17 01:15:48 marka Exp $";
+static const char rcsid[] = "$Id: ev_timers.c,v 1.2.2.5 2004/03/17 01:54:22 marka Exp $";
 #endif
 
 /* Import. */
@@ -180,11 +180,22 @@ evSetTimer(evContext opaqueCtx,
                 (long)due.tv_sec, due.tv_nsec,
                 (long)inter.tv_sec, inter.tv_nsec);
 
-       if (due.tv_sec < (time_t)0 || due.tv_nsec > BILLION)
+#ifdef __hpux
+       /*
+        * tv_sec and tv_nsec are unsigned.
+        */
+       if (due.tv_nsec >= BILLION)
                EV_ERR(EINVAL);
 
-       if (inter.tv_sec < (time_t)0 || inter.tv_nsec > BILLION)
+       if (inter.tv_nsec >= BILLION)
                EV_ERR(EINVAL);
+#else
+       if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
+               EV_ERR(EINVAL);
+
+       if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
+               EV_ERR(EINVAL);
+#endif
 
        /* due={0,0} is a magic cookie meaning "now." */
        if (due.tv_sec == 0 && due.tv_nsec == 0L)
@@ -285,11 +296,22 @@ evResetTimer(evContext opaqueCtx,
        if (heap_element(ctx->timers, timer->index) != timer)
                EV_ERR(ENOENT);
 
-       if (due.tv_sec < (time_t)0 || due.tv_nsec > BILLION)
+#ifdef __hpux
+       /*
+        * tv_sec and tv_nsec are unsigned.
+        */
+       if (due.tv_nsec >= BILLION)
                EV_ERR(EINVAL);
 
-       if (inter.tv_sec < (time_t)0 || inter.tv_nsec > BILLION)
+       if (inter.tv_nsec >= BILLION)
                EV_ERR(EINVAL);
+#else
+       if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
+               EV_ERR(EINVAL);
+
+       if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
+               EV_ERR(EINVAL);
+#endif
 
        old_due = timer->due;
 

diff --git a/lib/bind/isc/eventlib.c b/lib/bind/isc/eventlib.c
index b663e7e76227307b3f8e08c78d6c31f2f02f641b..9d15f41d799cf73a878c5663741f284c30e88b1a 100644 (file)
--- a/lib/bind/isc/eventlib.c
+++ b/lib/bind/isc/eventlib.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.2 2004/03/09 09:17:35 marka Exp $";
+static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.3 2004/03/17 01:54:22 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -590,7 +590,8 @@ evDrop(evContext opaqueCtx, evEvent opaqueEv) {
                 * Timer is still there.  Delete it if it has expired,
                 * otherwise set it according to its next interval.
                 */
-               if (this->inter.tv_sec == 0 && this->inter.tv_nsec == 0L) {
+               if (this->inter.tv_sec == (time_t)0 &&
+                   this->inter.tv_nsec == 0L) {
                        opaque.opaque = this;                   
                        (void) evClearTimer(opaqueCtx, opaque);
                } else {

diff --git a/lib/bind/isc/logging.c b/lib/bind/isc/logging.c
index ac5bfb352b5d9370744272ddb5e1d62075ea163a..1ed56d8f3694ebcad750a5c0c038ad8b1a4f6767 100644 (file)
--- a/lib/bind/isc/logging.c
+++ b/lib/bind/isc/logging.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: logging.c,v 1.3.2.2 2004/03/09 09:17:36 marka Exp $";
+static const char rcsid[] = "$Id: logging.c,v 1.3.2.3 2004/03/17 01:54:23 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -75,7 +75,7 @@ version_rename(log_channel chan) {
        /*
         * Need to have room for '.nn' (XXX assumes LOG_MAX_VERSIONS < 100)
         */
-       if (strlen(chan->out.file.name) > (PATH_MAX-3))
+       if (strlen(chan->out.file.name) > (size_t)(PATH_MAX-3))
                return;
        for (ver--; ver > 0; ver--) {
                sprintf(old_name, "%s.%d", chan->out.file.name, ver-1);
@@ -364,7 +364,7 @@ log_vwrite(log_context lc, int category, int level, const char *format,
 
                if (!did_vsprintf) {
                        if (VSPRINTF((lc->buffer, format, args)) >
-                           LOG_BUFFER_SIZE) {
+                           (size_t)LOG_BUFFER_SIZE) {
                                syslog(LOG_CRIT,
                                       "memory overrun in log_vwrite()");
                                exit(1);