pullup

1684.   [port]          64 bit size_t issues / compiler warnings.

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 07bdbb68198afb02eb25d1b20a9636cb9a956e61..f3588acb699389a3919eaffd960d90974976f467 100644 (file)
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.10 2002/02/20 01:43:59 gson Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.11 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /*
@@ -861,7 +861,8 @@ dst_s_read_private_key_file(char *name, DST_KEY *pk_key, u_int16_t in_id,
        len = cnt;
        p = in_buff;
 
-       if (!dst_s_verify_str((const char **) &p, "Private-key-format: v")) {
+       if (!dst_s_verify_str((const char **) (void *)&p,
+                              "Private-key-format: v")) {
                EREPORT(("dst_s_read_private_key_file(): Not a Key file/Decrypt failed %s\n", name));
                goto fail;
        }
@@ -879,7 +880,7 @@ dst_s_read_private_key_file(char *name, DST_KEY *pk_key, u_int16_t in_id,
 
        while (*p++ != '\n') ;  /* skip to end of line */
 
-       if (!dst_s_verify_str((const char **) &p, "Algorithm: "))
+       if (!dst_s_verify_str((const char **) (void *)&p, "Algorithm: "))
                goto fail;
 
        if (sscanf((char *)p, "%d", &alg) != 1)

diff --git a/lib/bind/irs/dns_nw.c b/lib/bind/irs/dns_nw.c
index 8368b747f65c248e6f9e7efb7c0c92b3479054fc..8ac89a47c4b23437240beb32fc0efb41c0937878 100644 (file)
--- a/lib/bind/irs/dns_nw.c
+++ b/lib/bind/irs/dns_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_nw.c,v 1.10 2004/05/17 07:52:46 marka Exp $";
+static const char rcsid[] = "$Id: dns_nw.c,v 1.11 2004/09/16 00:56:12 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -569,7 +569,7 @@ normalize_name(char *name) {
        /* Make lower case. */
        for (t = name; *t; t++)
                if (isascii((unsigned char)*t) && isupper((unsigned char)*t))
-                       *t = tolower(*t);
+                       *t = tolower((*t)&0xff);
 
        /* Remove trailing dots. */
        while (t > name && t[-1] == '.')

diff --git a/lib/bind/irs/gen.c b/lib/bind/irs/gen.c
index 093ecf361e8af5dac23e91ba0cc1aa170afaa728..ec360df7aecfea23f3845734873ab89acad462fb 100644 (file)
--- a/lib/bind/irs/gen.c
+++ b/lib/bind/irs/gen.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gen.c,v 1.5 2004/03/18 02:57:58 marka Exp $";
+static const char rcsid[] = "$Id: gen.c,v 1.6 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /*
@@ -391,8 +391,10 @@ init_map_rules(struct gen_p *irs, const char *conf_file) {
                default_map_rules(irs);
                return;
        }
-       (void) sprintf(pattern, "%%%ds %%%ds %%%ds\n",
-                      sizeof mapname, sizeof accname, sizeof options);
+       (void) sprintf(pattern, "%%%lus %%%lus %%%lus\n",
+                      (unsigned long)sizeof mapname,
+                      (unsigned long)sizeof accname,
+                      (unsigned long)sizeof options);
        while (fgets(line, sizeof line, conf)) {
                enum irs_map_id map;
                enum irs_acc_id acc;

diff --git a/lib/bind/isc/memcluster.c b/lib/bind/isc/memcluster.c
index aa210dd06da2849970d2430943dde8aa7104526b..110b904e2049b2bb63d1712949415a6cd3e8e6d8 100644 (file)
--- a/lib/bind/isc/memcluster.c
+++ b/lib/bind/isc/memcluster.c
@@ -24,7 +24,7 @@
 
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: memcluster.c,v 1.5 2004/03/18 02:58:00 marka Exp $";
+static const char rcsid[] = "$Id: memcluster.c,v 1.6 2004/09/16 00:56:12 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -471,9 +471,9 @@ memstats(FILE *out) {
 
                if (s->totalgets == 0U && s->gets == 0U)
                        continue;
-               fprintf(out, "%s%5d: %11lu gets, %11lu rem",
+               fprintf(out, "%s%5lu: %11lu gets, %11lu rem",
                        (i == max_size) ? ">=" : "  ",
-                       i, s->totalgets, s->gets);
+                       (unsigned long)i, s->totalgets, s->gets);
                if (s->blocks != 0U)
                        fprintf(out, " (%lu bl, %lu ff)",
                                s->blocks, s->freefrags);

diff --git a/lib/bind/nameser/ns_print.c b/lib/bind/nameser/ns_print.c
index 51592862b8df9c575d4e558fbe545e181b22d81e..10a40932990fee58a596534e4d24b58a418bbc76 100644 (file)
--- a/lib/bind/nameser/ns_print.c
+++ b/lib/bind/nameser/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.7 2004/07/28 20:16:49 marka Exp $";
+static const char rcsid[] = "$Id: ns_print.c,v 1.8 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /* Import. */
@@ -705,7 +705,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
        int n, m;
        char *p;
 
-       len = SPRINTF((tmp, "\\# %u%s\t; %s", edata - rdata,
+       len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
                       rdlen != 0 ? " (" : "", comment));
        T(addstr(tmp, len, &buf, &buflen));
        while (rdata < edata) {