[src/netbsd-1-5]: src/usr.sbin Pullup usr.sbin string format fixes [is].

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-1-5]: src/usr.sbin Pullup usr.sbin string format fixes [is].
From: tv <tv%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 07:23:13 +0000

details:   https://anonhg.NetBSD.org/src/rev/4c039bca138c
branches:  netbsd-1-5
changeset: 489797:4c039bca138c
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 19:50:17 2000 +0000

description:
Pullup usr.sbin string format fixes [is].
See "cvs log" for explicit revision numbers per file, from sommerfeld.

diffstat:

 usr.sbin/amd/hlfsd/hlfsd.c      |   4 ++--
 usr.sbin/amd/include/am_utils.h |   6 +++---
 usr.sbin/amd/libamu/mount_fs.c  |  10 +++-------
 usr.sbin/amd/libamu/xutil.c     |  21 +++++++++++++--------
 usr.sbin/arp/arp.c              |  12 ++++--------
 usr.sbin/bind/Makefile.inc      |   4 ++--
 usr.sbin/bootp/bootpd/bootpd.c  |   4 ++--
 7 files changed, 29 insertions(+), 32 deletions(-)

diffs (216 lines):

diff -r b319fd208f9a -r 4c039bca138c usr.sbin/amd/hlfsd/hlfsd.c
--- a/usr.sbin/amd/hlfsd/hlfsd.c        Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/amd/hlfsd/hlfsd.c        Tue Oct 17 19:50:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hlfsd.c,v 1.8 1999/09/04 22:38:18 christos Exp $       */
+/*     $NetBSD: hlfsd.c,v 1.8.8.1 2000/10/17 19:50:17 tv Exp $ */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -949,7 +949,7 @@
 #endif
     }
   }
-  plog(XLOG_FATAL, mess);
+  plog(XLOG_FATAL, "%s", mess);
 
   hlfsd_going_down(1);
 }
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/amd/include/am_utils.h
--- a/usr.sbin/amd/include/am_utils.h   Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/amd/include/am_utils.h   Tue Oct 17 19:50:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: am_utils.h,v 1.8 1999/09/04 22:38:19 christos Exp $    */
+/*     $NetBSD: am_utils.h,v 1.8.8.1 2000/10/17 19:50:18 tv Exp $      */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -645,7 +645,7 @@
 extern void normalize_slash(char *);
 extern void ops_showamfstypes(char *buf);
 extern void ops_showfstypes(char *outbuf);
-extern void plog(int, char *,...)
+extern void plog(int, const char *,...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
 extern void rem_que(qelem *);
 extern void reschedule_timeout_mp(void);
@@ -967,7 +967,7 @@
 extern int debug_flags;                /* Debug options */
 extern int debug_option (char *opt);
 extern struct opt_tab dbg_opt[];
-extern void dplog(char *fmt, ...)
+extern void dplog(const char *fmt, ...)
      __attribute__ ((__format__ (__printf__, 1, 2)));
 
 /**************************************************************************/
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/amd/libamu/mount_fs.c
--- a/usr.sbin/amd/libamu/mount_fs.c    Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/amd/libamu/mount_fs.c    Tue Oct 17 19:50:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount_fs.c,v 1.1.1.7 1999/09/04 22:24:56 christos Exp $        */
+/*     $NetBSD: mount_fs.c,v 1.1.1.7.8.1 2000/10/17 19:50:18 tv Exp $  */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -176,14 +176,10 @@
   char optsbuf[48];
 # endif /* defined(MNTTAB_OPT_DEV) || (defined(HAVE_FS_NFS3) && defined(MNTTAB_OPT_VERS)) || defined(MNTTAB_OPT_PROTO) */
 #endif /* MOUNT_TABLE_ON_FILE */
-#ifdef DEBUG
-  char buf[80];                        /* buffer for sprintf */
-#endif /* DEBUG */
 
 #ifdef DEBUG
-  sprintf(buf, "%s%s%s",
-         "%s fstype ", MTYPE_PRINTF_TYPE, " (%s) flags %#x (%s)");
-  dlog(buf, mnt->mnt_dir, type, mnt->mnt_type, flags, mnt->mnt_opts);
+  dlog("%s fstype " MTYPE_PRINTF_TYPE " (%s) flags %#x (%s)", 
+       mnt->mnt_dir, type, mnt->mnt_type, flags, mnt->mnt_opts);
 #endif /* DEBUG */
 
 again:
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/amd/libamu/xutil.c
--- a/usr.sbin/amd/libamu/xutil.c       Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/amd/libamu/xutil.c       Tue Oct 17 19:50:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xutil.c,v 1.5 2000/01/15 15:51:54 bouyer Exp $ */
+/*     $NetBSD: xutil.c,v 1.5.4.1 2000/10/17 19:50:18 tv Exp $ */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -82,7 +82,8 @@
 #endif /* DEBUG_MEM */
 
 /* forward definitions */
-static void real_plog(int lvl, char *fmt, va_list vargs);
+static void real_plog(int lvl, const char *fmt, va_list vargs)
+     __attribute__((__format__(__printf__, 2, 0)));
 
 #ifdef DEBUG
 /*
@@ -283,10 +284,13 @@
  * 'e' never gets longer than maxlen characters.
  */
 static void
-expand_error(char *f, char *e, int maxlen)
+expand_error(const char *f, char *e, int maxlen)
 {
+#ifndef HAVE_STRERROR
   extern int sys_nerr;
-  char *p, *q;
+#endif
+  const char *p;
+  char *q;
   int error = errno;
   int len = 0;
 
@@ -378,7 +382,7 @@
 
 
 void
-dplog(char *fmt, ...)
+dplog(const char *fmt, ...)
 {
   va_list ap;
 
@@ -393,7 +397,7 @@
 
 
 void
-plog(int lvl, char *fmt, ...)
+plog(int lvl, const char *fmt, ...)
 {
   va_list ap;
 
@@ -407,7 +411,7 @@
 
 
 static void
-real_plog(int lvl, char *fmt, va_list vargs)
+real_plog(int lvl, const char *fmt, va_list vargs)
 {
   char msg[1024];
   char efmt[1024];
@@ -430,7 +434,8 @@
    * to 1023 (including the '\0').
    * 
    */
-  vsnprintf(ptr, 1023, efmt, vargs);
+  fmt = efmt;
+  vsnprintf(ptr, 1023, fmt, vargs);
   msg[1022] = '\0';            /* null terminate, to be sure */
 
   ptr += strlen(ptr);
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/arp/arp.c
--- a/usr.sbin/arp/arp.c        Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/arp/arp.c        Tue Oct 17 19:50:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arp.c,v 1.23 1998/02/10 03:45:06 mrg Exp $ */
+/*     $NetBSD: arp.c,v 1.23.10.1 2000/10/17 19:50:19 tv Exp $ */
 
 /*
  * Copyright (c) 1984, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)arp.c      8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: arp.c,v 1.23 1998/02/10 03:45:06 mrg Exp $");
+__RCSID("$NetBSD: arp.c,v 1.23.10.1 2000/10/17 19:50:19 tv Exp $");
 #endif
 #endif /* not lint */
 
@@ -460,18 +460,14 @@
 {
        int i;
        u_int8_t *p;
-       const char *hexfmt = "%x";
-
-       if (sdl->sdl_type == IFT_ETHER || sdl->sdl_type == IFT_FDDI)
-               hexfmt = "%02x";
 
        i = sdl->sdl_alen;
        p = LLADDR(sdl);
 
-       (void)printf(hexfmt, *p);
+       (void)printf("%02x", *p);
        while (--i > 0) {
                putchar(':');
-               (void)printf(hexfmt, *++p);
+               (void)printf("%02x", *++p);
        }
 }
 
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/bind/Makefile.inc
--- a/usr.sbin/bind/Makefile.inc        Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/bind/Makefile.inc        Tue Oct 17 19:50:17 2000 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.6 2000/03/01 10:50:01 itojun Exp $
+# $NetBSD: Makefile.inc,v 1.6.4.1 2000/10/17 19:50:19 tv Exp $
 
 WARNS=0
-
+WFORMAT=2
 BIND_DIR=      ${.CURDIR}/..
 BIND_DIST_DIR= ${.CURDIR}/../../../dist/bind
 
diff -r b319fd208f9a -r 4c039bca138c usr.sbin/bootp/bootpd/bootpd.c
--- a/usr.sbin/bootp/bootpd/bootpd.c    Tue Oct 17 19:49:44 2000 +0000
+++ b/usr.sbin/bootp/bootpd/bootpd.c    Tue Oct 17 19:50:17 2000 +0000
@@ -22,7 +22,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: bootpd.c,v 1.12 1999/01/31 19:12:27 briggs Exp $");
+__RCSID("$NetBSD: bootpd.c,v 1.12.10.1 2000/10/17 19:50:19 tv Exp $");
 #endif
 
 /*
@@ -1242,7 +1242,7 @@
        int bytesleft, len;
        byte *vp;
 
-       static char noroom[] = "%s: No room for \"%s\" option";
+       static const char noroom[] = "%s: No room for \"%s\" option";
 
        vp = bp->bp_vend;

Prev by Date: [src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.5 - 1.6 (approved by tv)
Next by Date: [src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.8 - 1.9 (approved by tv)
Previous by Thread: [src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.5 - 1.6 (approved by tv)
Next by Thread: [src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.8 - 1.9 (approved by tv)
Indexes:

Home | Main Index | Thread Index | Old Index