[src/netbsd-1-4]: src/dist/bind/bin/named Pull up revision 1.2 (requested by ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ea3527a545a9
branches:  netbsd-1-4
changeset: 470960:ea3527a545a9
user:      he <he%NetBSD.org@localhost>
date:      Tue Oct 10 21:12:07 2000 +0000

description:
Pull up revision 1.2 (requested by is):
  Format string cleanup.

diffstat:

 dist/bind/bin/named/db_dump.c   |   4 ++--
 dist/bind/bin/named/db_glue.c   |   4 ++--
 dist/bind/bin/named/db_load.c   |   4 ++--
 dist/bind/bin/named/db_update.c |   8 ++++----
 dist/bind/bin/named/ns_ctl.c    |   5 +++--
 dist/bind/bin/named/ns_forw.c   |  12 ++++++------
 6 files changed, 19 insertions(+), 18 deletions(-)

diffs (151 lines):

diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/db_dump.c
--- a/dist/bind/bin/named/db_dump.c     Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/db_dump.c     Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_dump.c,v 1.1.1.1.2.2 1999/12/04 16:53:11 he Exp $   */
+/*     $NetBSD: db_dump.c,v 1.1.1.1.2.3 2000/10/10 21:12:07 he Exp $   */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_dump.c    4.33 (Berkeley) 3/3/91";
@@ -615,7 +615,7 @@
                                getname(np, dname, sizeof(dname));
                                when = db_lame_find(dname, dp);
                                if (when != 0 && when > tt.tv_sec) {
-                                       fprintf(fp, "%sLAME=%d",
+                                       fprintf(fp, "%sLAME=%ld",
                                                sep, when - tt.tv_sec);
                                        sep = " ";
                                }
diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/db_glue.c
--- a/dist/bind/bin/named/db_glue.c     Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/db_glue.c     Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_glue.c,v 1.1.1.1.2.2 1999/12/04 16:53:25 he Exp $   */
+/*     $NetBSD: db_glue.c,v 1.1.1.1.2.3 2000/10/10 21:12:12 he Exp $   */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_glue.c    4.4 (Berkeley) 6/1/90";
@@ -404,7 +404,7 @@
        if ( (np->n_data && (msg = "data"))
          || (np->n_hash && (msg = "hash"))
            ) {
-               ns_panic(ns_log_db, 1, "rm_name(%#x(%s)): non-nil %s pointer",
+               ns_panic(ns_log_db, 1, "rm_name(%p(%s)): non-nil %s pointer",
                         np, NAME(*np), msg);
        }
 
diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/db_load.c
--- a/dist/bind/bin/named/db_load.c     Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/db_load.c     Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_load.c,v 1.1.1.1.2.2 1999/12/04 16:53:35 he Exp $   */
+/*     $NetBSD: db_load.c,v 1.1.1.1.2.3 2000/10/10 21:12:15 he Exp $   */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_load.c    4.38 (Berkeley) 3/2/91";
@@ -685,7 +685,7 @@
                                        ns_notice(ns_log_load,
                         "%s:%d: WARNING: new serial number < old (%lu < %lu)",
                                                  filename , lineno,
-                                                 zp->z_serial, serial);
+                                                 (long)zp->z_serial, (long)serial);
                                }
                                if (getttl(fp, filename, lineno, &n,
                                           &multiline) <= 0) {
diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/db_update.c
--- a/dist/bind/bin/named/db_update.c   Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/db_update.c   Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_update.c,v 1.1.1.1.2.2 1999/12/04 16:53:59 he Exp $ */
+/*     $NetBSD: db_update.c,v 1.1.1.1.2.3 2000/10/10 21:12:18 he Exp $ */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_update.c  4.28 (Berkeley) 3/21/91";
@@ -233,7 +233,7 @@
        struct databuf *tmpdp;
 #endif
 
-       ns_debug(ns_log_db, 3, "db_update(%s, %#x, %#x, %#x, 0%o, %#x)%s",
+       ns_debug(ns_log_db, 3, "db_update(%s, %p, %p, %p, 0%o, %p)%s",
                 name, odp, newdp, savedpp, flags, htp,
                 (odp && (odp->d_flags&DB_F_HINT)) ? " hint" : "");
        np = nlookup(name, &htp, &fname, newdp != NULL);
@@ -327,7 +327,7 @@
                              fcachetab, from)
                    != OK) {
                        ns_debug(ns_log_db, 3,
-                                "db_update: hint %#x freed", dp);
+                                "db_update: hint %p freed", dp);
                        db_freedata(dp);
                }
         }
@@ -754,7 +754,7 @@
         *      response source address here if flags&NOTAUTH.
         */
        fixttl(newdp);
-       ns_debug(ns_log_db, 3, "db_update: adding%s %#x",
+       ns_debug(ns_log_db, 3, "db_update: adding%s %p",
                 (newdp->d_flags&DB_F_HINT) ? " hint":"", newdp);
 
        if (NS_OPTION_P(OPTION_HOSTSTATS) &&
diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/ns_ctl.c
--- a/dist/bind/bin/named/ns_ctl.c      Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/ns_ctl.c      Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_ctl.c,v 1.1.1.1.2.2 1999/12/04 16:54:19 he Exp $    */
+/*     $NetBSD: ns_ctl.c,v 1.1.1.1.2.3 2000/10/10 21:12:23 he Exp $    */
 
 #if !defined(lint) && !defined(SABER)
 static const char rcsid[] = "Id: ns_ctl.c,v 8.28 1999/10/13 16:39:04 vixie Exp";
@@ -91,7 +91,8 @@
 static void            install(control);
 static void            install_inet(control);
 static void            install_unix(control);
-static void            logger(enum ctl_severity, const char *fmt, ...);
+static void            logger(enum ctl_severity, const char *fmt, ...)
+     __attribute__((__format__(__printf__, 2, 3)));
 static void            verb_connect(struct ctl_sctx *, struct ctl_sess *,
                                     const struct ctl_verb *,
                                     const char *, u_int, void *, void *);
diff -r 55a7f51412c0 -r ea3527a545a9 dist/bind/bin/named/ns_forw.c
--- a/dist/bind/bin/named/ns_forw.c     Sun Oct 08 18:51:31 2000 +0000
+++ b/dist/bind/bin/named/ns_forw.c     Tue Oct 10 21:12:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_forw.c,v 1.1.1.1.2.2 1999/12/04 16:54:29 he Exp $   */
+/*     $NetBSD: ns_forw.c,v 1.1.1.1.2.3 2000/10/10 21:12:26 he Exp $   */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_forw.c    4.32 (Berkeley) 3/3/91";
@@ -466,7 +466,7 @@
        int oldn, naddr, class, found_arr, potential_ns, lame_ns;
        time_t curtime;
 
-       ns_debug(ns_log_default, 3, "nslookup(nsp=%#x, qp=%#x, \"%s\")",
+       ns_debug(ns_log_default, 3, "nslookup(nsp=%p, qp=%p, \"%s\")",
                nsp, qp, syslogdname);
 
        lame_ns = potential_ns = 0;
@@ -504,7 +504,7 @@
                tmphtp = ((nsdp->d_flags & DB_F_HINT) ?fcachetab :hashtab);
                np = nlookup(dname, &tmphtp, &fname, 0);
                if (np == NULL) {
-                       ns_debug(ns_log_default, 3, "%s: not found %s %#x",
+                       ns_debug(ns_log_default, 3, "%s: not found %s %p",
                                 dname, fname, np);
                        found_arr = 0;
                        goto need_sysquery;
@@ -818,11 +818,11 @@
 schedretry(struct qinfo *qp, time_t t) {
        struct qinfo *qp1, *qp2;
 
-       ns_debug(ns_log_default, 4, "schedretry(%#x, %ld sec)", qp, (long)t);
+       ns_debug(ns_log_default, 4, "schedretry(%p, %ld sec)", qp, (long)t);
        if (qp->q_time)
                ns_debug(ns_log_default, 4,
-                        "WARNING: schedretry(%#lx, %ld) q_time already %ld",
-                        (u_long)qp, (long)t, (long)qp->q_time);
+                        "WARNING: schedretry(%p, %ld) q_time already %ld",
+                        qp, (long)t, (long)qp->q_time);
        gettime(&tt);
        t += (u_long) tt.tv_sec;
        qp->q_time = t;