]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
silence compiler warnings
authorMark Andrews <marka@isc.org>
Thu, 16 Sep 2004 01:01:27 +0000 (01:01 +0000)
committerMark Andrews <marka@isc.org>
Thu, 16 Sep 2004 01:01:27 +0000 (01:01 +0000)
bin/dig/dig.c
bin/dig/dighost.c
bin/nsupdate/nsupdate.c
lib/bind9/getaddresses.c
lib/dns/rdata/in_1/wks_11.c
lib/isc/string.c
lib/lwres/print.c

index 5afb95f52af6e789427074863360550ba2a5ea7a..103963c8be2366489b023359a84f7e2365285557 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.197 2004/09/06 06:22:35 marka Exp $ */
+/* $Id: dig.c,v 1.198 2004/09/16 01:01:25 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -1338,7 +1338,7 @@ getaddresses(dig_lookup_t *lookup, const char *host) {
        isc_result_t result;
        isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
        isc_netaddr_t netaddr;
-       unsigned int count, i;
+       int count, i;
        dig_server_t *srv;
        char tmp[ISC_NETADDR_FORMATSIZE];
 
index 5cd9614ba1e7bf838a899141d693323a2f2a8c47..a1f11a816ab70250f52dee4d8ee72a809d055f17 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.265 2004/09/06 01:24:43 marka Exp $ */
+/* $Id: dighost.c,v 1.266 2004/09/16 01:01:25 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -573,7 +573,7 @@ set_nameserver(char *opt) {
        isc_result_t result;
        isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
        isc_netaddr_t netaddr;
-       unsigned int count, i;
+       int count, i;
        dig_server_t *srv;
        char tmp[ISC_NETADDR_FORMATSIZE];
 
index 5e7c13b0c5edbabb693e291cb11f0e0b1d6e3d9d..dece03d5b353a8b5b80e11a684f5c0e3d25a9e56 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.133 2004/06/17 01:03:00 sra Exp $ */
+/* $Id: nsupdate.c,v 1.134 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 
@@ -627,7 +627,7 @@ parse_args(int argc, char **argv) {
                                exit(1);
                        }
                        if (timeout == 0)
-                               timeout = ULONG_MAX;
+                               timeout = UINT_MAX;
                        break;
                case 'u':
                        result = isc_parse_uint32(&udp_timeout,
@@ -637,7 +637,7 @@ parse_args(int argc, char **argv) {
                                exit(1);
                        }
                        if (udp_timeout == 0)
-                               udp_timeout = ULONG_MAX;
+                               udp_timeout = UINT_MAX;
                        break;
                case 'r':
                        result = isc_parse_uint32(&udp_retries,
index d407f64066850239648139135c8b9313333b23cf..dd35bcebdf048c76b30337099d73ce803909cf85 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddresses.c,v 1.16 2004/05/15 03:37:33 jinmei Exp $ */
+/* $Id: getaddresses.c,v 1.17 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 #include <string.h>
@@ -84,7 +84,7 @@ bind9_getaddresses(const char *hostname, in_port_t port,
                        isc_sockaddr_v6fromin(&addrs[0], &in4, port);
                *addrcount = 1;
                return (ISC_R_SUCCESS);
-       } else if (strlen(hostname) <= 127) {
+       } else if (strlen(hostname) <= 127U) {
                char tmpbuf[128], *d;
                isc_uint32_t zone = 0;
 
index 00fde6c4241751540a93f9b353ccff68b19105a8..233c4b29ab1f9894d7e7fa5dde4150a770e32342 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.51 2004/03/05 05:10:25 marka Exp $ */
+/* $Id: wks_11.c,v 1.52 2004/09/16 01:01:26 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -107,7 +107,7 @@ fromtext_in_wks(ARGS_FROMTEXT) {
                service[sizeof(service)-1] = '\0';
                for (i = strlen(service) - 1; i >= 0; i--)
                        if (isupper(service[i]&0xff))
-                               service[i] = tolower(service[i]);
+                               service[i] = tolower(service[i]&0xff);
 
                port = strtol(DNS_AS_STR(token), &e, 10);
                if (*e == 0)
index 99a126a1a6b9a899710ac5eaa73b1dad5fca982b..8895a8e143ec3126c94da377f20fa39055c35a2e 100644 (file)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.10 2004/03/18 02:58:06 marka Exp $ */
+/* $Id: string.c,v 1.11 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 
@@ -60,7 +60,7 @@ isc_string_touint64(char *source, char **end, int base) {
        tmp = 0;
 
        while ((c = *s) != 0) {
-               c = tolower(c);
+               c = tolower(c&0xff);
                /* end ? */
                if ((o = strchr(digits, c)) == NULL) {
                        *end = s;
index 8911e004d8edad09f40a5d7fc6baf4a95770001b..767a65b21c1a88c629c62d5406193c60e2508134 100644 (file)
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.2 2004/08/28 06:20:14 marka Exp $ */
+/* $Id: print.c,v 1.3 2004/09/16 01:01:27 marka Exp $ */
 
 #include <config.h>
 
 #include <ctype.h>
 #include <stdio.h>             /* for sprintf */
+#include <string.h>
 
 #define        LWRES__PRINT_SOURCE     /* Used to get the lwres_print_* prototypes. */
 
@@ -96,7 +97,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 
        while (*format != '\0') {
                if (*format != '%') {
-                       if (size > 1) {
+                       if (size > 1U) {
                                *str++ = *format;
                                size--;
                        }
@@ -170,7 +171,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                case '\0':
                        continue;
                case '%':
-                       if (size > 1) {
+                       if (size > 1U) {
                                *str++ = *format;
                                size--;
                        }
@@ -312,28 +313,28 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                                count += strlen(head) + strlen(buf) + pad +
                                         zeropad;
                                if (!left) {
-                                       while (pad > 0 && size > 1) {
+                                       while (pad > 0 && size > 1U) {
                                                *str++ = ' ';
                                                size--;
                                                pad--;
                                        }
                                }
                                cp = head;
-                               while (*cp != '\0' && size > 1) {
+                               while (*cp != '\0' && size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                               while (zeropad > 0 && size > 1) {
+                               while (zeropad > 0 && size > 1U) {
                                        *str++ = '0';
                                        size--;
                                        zeropad--;
                                }
                                cp = buf;
-                               while (*cp != '\0' && size > 1) {
+                               while (*cp != '\0' && size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                               while (pad > 0 && size > 1) {
+                               while (pad > 0 && size > 1U) {
                                        *str++ = ' ';
                                        size--;
                                        pad--;
@@ -369,24 +370,24 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                        }
                        count += pad + length;
                        if (!left)
-                               while (pad > 0 && size > 1) {
+                               while (pad > 0 && size > 1U) {
                                        *str++ = ' ';
                                        size--;
                                        pad--;
                                }
                        if (precision != 0)
                                while (precision > 0 && *cp != '\0' &&
-                                      size > 1) {
+                                      size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                        precision--;
                                }
                        else
-                               while (*cp != '\0' && size > 1) {
+                               while (*cp != '\0' && size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                       while (pad > 0 && size > 1) {
+                       while (pad > 0 && size > 1U) {
                                *str++ = ' ';
                                size--;
                                pad--;
@@ -401,17 +402,17 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                                        *str++ = c;
                                        size--;
                                }
-                               while (width-- > 0 && size > 1) {
+                               while (width-- > 0 && size > 1U) {
                                        *str++ = ' ';
                                        size--;
                                }
-                               if (!left && size > 1) {
+                               if (!left && size > 1U) {
                                        *str++ = c;
                                        size--;
                                }
                        } else {
                                count++;
-                               if (size > 1) {
+                               if (size > 1U) {
                                        *str++ = c;
                                        size--;
                                }
@@ -430,7 +431,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                        }
                        count += length + pad + zeropad;
                        if (!left)
-                               while (pad > 0 && size > 1) {
+                               while (pad > 0 && size > 1U) {
                                        *str++ = ' ';
                                        size--;
                                        pad--;
@@ -438,25 +439,25 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                        cp = buf;
                        if (zeropad > 0 && buf[0] == '0' &&
                            (buf[1] == 'x' || buf[1] == 'X')) {
-                               if (size > 1) {
+                               if (size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                               if (size > 1) {
+                               if (size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                               while (zeropad > 0 && size > 1) {
+                               while (zeropad > 0 && size > 1U) {
                                        *str++ = '0';
                                        size--;
                                        zeropad--;
                                }
                        }
-                       while (*cp != '\0' && size > 1) {
+                       while (*cp != '\0' && size > 1U) {
                                *str++ = *cp++;
                                size--;
                        }
-                       while (pad > 0 && size > 1) {
+                       while (pad > 0 && size > 1U) {
                                *str++ = ' ';
                                size--;
                                pad--;
@@ -522,17 +523,17 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                                }
                                count += length + pad;
                                if (!left)
-                                       while (pad > 0 && size > 1) {
+                                       while (pad > 0 && size > 1U) {
                                                *str++ = ' ';
                                                size--;
                                                pad--;
                                        }
                                cp = buf;
-                               while (*cp != ' ' && size > 1) {
+                               while (*cp != ' ' && size > 1U) {
                                        *str++ = *cp++;
                                        size--;
                                }
-                               while (pad > 0 && size > 1) {
+                               while (pad > 0 && size > 1U) {
                                        *str++ = ' ';
                                        size--;
                                        pad--;
@@ -547,7 +548,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                }
                format++;
        }
-       if (size > 0)
+       if (size > 0U)
                *str = '\0';
        return (count);
 }