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

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

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

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

diffstat:

 dist/bind/bin/named/ns_main.c |  25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diffs (97 lines):

diff -r c4b2a74947f0 -r 88b59ce140ef dist/bind/bin/named/ns_main.c
--- a/dist/bind/bin/named/ns_main.c     Tue Oct 10 21:12:35 2000 +0000
+++ b/dist/bind/bin/named/ns_main.c     Tue Oct 10 21:12:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_main.c,v 1.4.2.3 2000/03/01 14:00:03 he Exp $       */
+/*     $NetBSD: ns_main.c,v 1.4.2.4 2000/10/10 21:12:52 he Exp $       */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_main.c    4.55 (Berkeley) 7/1/91";
@@ -216,10 +216,10 @@
        exit(1);
 }
 
-static char bad_p_option[] =
+static const char bad_p_option[] =
 "-p remote/local obsolete; use 'listen-on' in config file to specify local";
 
-static char bad_directory[] = "chdir failed for directory '%s': %s";
+static const char bad_directory[] = "chdir failed for directory '%s': %s";
 
 /*ARGSUSED*/
 int
@@ -916,8 +916,8 @@
        sp->s_time = tt.tv_sec;
 
        if (ns_wouldlog(ns_log_default,5)) {
-               ns_debug(ns_log_default, 5, "sp %#x rfd %d size %d time %d next %#x",
-                       sp, sp->s_rfd, sp->s_size, sp->s_time, sp->s_next);
+               ns_debug(ns_log_default, 5, "sp %p rfd %d size %d time %ld next %p",
+                       sp, sp->s_rfd, sp->s_size, (long)sp->s_time, sp->s_next);
                ns_debug(ns_log_default, 5, "\tbufsize %d bytes %d", sp->s_bufsize,
                         bytes);
        }
@@ -1125,7 +1125,7 @@
                buf = memget(bufsiz);
                if (!buf)
                        ns_panic(ns_log_default, 1,
-                               "memget(interface)", NULL);
+                               "memget(interface)");
                ifc.ifc_len = bufsiz;
                ifc.ifc_buf = buf;
 #ifdef IRIX_EMUL_IOCTL_SIOCGIFCONF
@@ -1247,7 +1247,7 @@
                                ifp = (interface *)memget(sizeof *ifp);
                                if (!ifp)
                                        ns_panic(ns_log_default, 1,
-                                                "memget(interface)", NULL);
+                                                "memget(interface)");
                                memset(ifp, 0, sizeof *ifp);
                                APPEND(iflist, ifp, link);
                                ifp->addr = ina;
@@ -2408,8 +2408,7 @@
                nsid_vtable = memget(NSID_SHUFFLE_TABLE_SIZE *
                                     (sizeof(u_int16_t)) );
                if (!nsid_vtable)
-                       ns_panic(ns_log_default, 1, "memget(nsid_vtable)",
-                                NULL);
+                       ns_panic(ns_log_default, 1, "memget(nsid_vtable)");
                for (i = 0; i < NSID_SHUFFLE_TABLE_SIZE; i++) {
                        nsid_vtable[i] = nsid_state;
                        nsid_state = (((u_long) nsid_a1 * nsid_state) + nsid_c1)
@@ -2421,7 +2420,7 @@
                nsid_algorithm = NSID_USE_POOL;
                nsid_pool = memget(0x10000 * (sizeof(u_int16_t)));
                if (!nsid_pool)
-                       ns_panic(ns_log_default, 1, "memget(nsid_pool)", NULL);
+                       ns_panic(ns_log_default, 1, "memget(nsid_pool)");
                for (i = 0; ; i++) {
                        nsid_pool[i] = nsid_state;
                        nsid_state = (((u_long) nsid_a1 * nsid_state) + nsid_c1)                                     & 0xFFFF;
@@ -2475,7 +2474,7 @@
                else
                        nsid_state++;
        } else
-               ns_panic(ns_log_default, 1, "Unknown ID algorithm", NULL);
+               ns_panic(ns_log_default, 1, "Unknown ID algorithm");
 
        /* Now lets obfuscate ... */
        id = (((u_long) nsid_a2 * id) + nsid_c2) & 0xFFFF;
@@ -2600,7 +2599,7 @@
 
 static void
 wild(void) {
-       ns_panic(ns_log_default, 1, "wild need", NULL);
+       ns_panic(ns_log_default, 1, "wild need");
 }
 
 /*
@@ -2641,7 +2640,7 @@
                        (handlers[need])();
                        return;
                }
-       ns_panic(ns_log_default, 1, "handle_need() found no needs", NULL);
+       ns_panic(ns_log_default, 1, "handle_need() found no needs");
 }
 
 void