[src/netbsd-1-5]: src/sbin pullup (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/1f149ff133f7
branches:  netbsd-1-5
changeset: 488773:1f149ff133f7
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jul 27 16:12:34 2000 +0000

description:
pullup (approved by releng-1-5)
printf-like format pedant.  do not pass string variable alone.  use "%s".
from openbsd.

/cvsroot/basesrc/sbin/swapctl/swapctl.c 1.14 -> 1.15
/cvsroot/basesrc/sbin/ping6/ping6.c     1.15 -> 1.16
/cvsroot/basesrc/sbin/disklabel/disklabel.c     1.84 -> 1.85
/cvsroot/basesrc/sbin/ccdconfig/ccdconfig.c     1.30 -> 1.31

diffstat:

 sbin/ccdconfig/ccdconfig.c |  12 ++++++------
 sbin/disklabel/disklabel.c |   6 +++---
 sbin/ping6/ping6.c         |  10 +++++-----
 sbin/swapctl/swapctl.c     |   4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (131 lines):

diff -r 2d80328f65be -r 1f149ff133f7 sbin/ccdconfig/ccdconfig.c
--- a/sbin/ccdconfig/ccdconfig.c        Thu Jul 27 16:07:03 2000 +0000
+++ b/sbin/ccdconfig/ccdconfig.c        Thu Jul 27 16:12:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccdconfig.c,v 1.30 2000/06/09 15:06:31 enami Exp $     */
+/*     $NetBSD: ccdconfig.c,v 1.30.2.1 2000/07/27 16:12:34 itojun Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 __COPYRIGHT(
 "@(#) Copyright (c) 1996, 1997\
        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: ccdconfig.c,v 1.30 2000/06/09 15:06:31 enami Exp $");
+__RCSID("$NetBSD: ccdconfig.c,v 1.30.2.1 2000/07/27 16:12:34 itojun Exp $");
 #endif
 
 #include <sys/param.h>
@@ -499,8 +499,8 @@
 
 #define KVM_ABORT(kd, str) {                                           \
        (void)kvm_close((kd));                                          \
-       warnx((str));                                                   \
-       warnx(kvm_geterr((kd)));                                        \
+       warnx("%s", (str));                                             \
+       warnx("%s", kvm_geterr((kd)));                                  \
        return (1);                                                     \
 }
 
@@ -637,7 +637,7 @@
            readsize) != readsize) {
                printf("\n");
                warnx("can't read component info");
-               warnx(kvm_geterr(kd));
+               warnx("%s", kvm_geterr(kd));
                goto done;
        }
 
@@ -647,7 +647,7 @@
                    cip[i].ci_pathlen) != cip[i].ci_pathlen) {
                        printf("\n");
                        warnx("can't read component pathname");
-                       warnx(kvm_geterr(kd));
+                       warnx("%s", kvm_geterr(kd));
                        goto done;
                }
                printf((i + 1 < cs->sc_nccdisks) ? "%s " : "%s\n", path);
diff -r 2d80328f65be -r 1f149ff133f7 sbin/disklabel/disklabel.c
--- a/sbin/disklabel/disklabel.c        Thu Jul 27 16:07:03 2000 +0000
+++ b/sbin/disklabel/disklabel.c        Thu Jul 27 16:12:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.84.2.1 2000/07/13 02:15:36 hubertf Exp $       */
+/*     $NetBSD: disklabel.c,v 1.84.2.2 2000/07/27 16:12:34 itojun Exp $        */
 
 /*
  * Copyright (c) 1987, 1993
@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)disklabel.c        8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c        1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: disklabel.c,v 1.84.2.1 2000/07/13 02:15:36 hubertf Exp $");
+__RCSID("$NetBSD: disklabel.c,v 1.84.2.2 2000/07/27 16:12:34 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -861,7 +861,7 @@
                        }
                }
                if (msg != NULL)
-                       errx(1, msg);
+                       errx(1, "%s", msg);
                /*
                 * There was no label on the disk. Get the fictious one
                 * as a basis for initialisation.
diff -r 2d80328f65be -r 1f149ff133f7 sbin/ping6/ping6.c
--- a/sbin/ping6/ping6.c        Thu Jul 27 16:07:03 2000 +0000
+++ b/sbin/ping6/ping6.c        Thu Jul 27 16:12:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ping6.c,v 1.15 2000/06/12 16:21:04 itojun Exp $        */
+/*     $NetBSD: ping6.c,v 1.15.2.1 2000/07/27 16:12:35 itojun Exp $    */
 /*     $KAME: ping6.c,v 1.55 2000/06/12 16:18:32 itojun Exp $  */
 
 /*
@@ -81,7 +81,7 @@
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.15 2000/06/12 16:21:04 itojun Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.15.2.1 2000/07/27 16:12:35 itojun Exp $");
 #endif
 #endif
 
@@ -547,9 +547,9 @@
 #ifdef IPSEC_POLICY_IPSEC
        if (options & F_POLICY) {
                if (setpolicy(s, policy_in) < 0)
-                       errx(1, ipsec_strerror());
+                       errx(1, "%s", ipsec_strerror());
                if (setpolicy(s, policy_out) < 0)
-                       errx(1, ipsec_strerror());
+                       errx(1, "%s", ipsec_strerror());
        }
 #else
        if (options & F_AUTHHDR) {
@@ -1901,7 +1901,7 @@
 
        buf = ipsec_set_policy(policy, strlen(policy));
        if (buf == NULL)
-               errx(1, ipsec_strerror());
+               errx(1, "%s", ipsec_strerror());
        if (setsockopt(s, IPPROTO_IPV6, IPV6_IPSEC_POLICY,
                        buf, ipsec_get_policylen(buf)) < 0)
                warnx("Unable to set IPSec policy");
diff -r 2d80328f65be -r 1f149ff133f7 sbin/swapctl/swapctl.c
--- a/sbin/swapctl/swapctl.c    Thu Jul 27 16:07:03 2000 +0000
+++ b/sbin/swapctl/swapctl.c    Thu Jul 27 16:12:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swapctl.c,v 1.14 2000/04/13 08:29:56 mrg Exp $ */
+/*     $NetBSD: swapctl.c,v 1.14.4.1 2000/07/27 16:12:35 itojun Exp $  */
 
 /*
  * Copyright (c) 1996, 1997, 1999 Matthew R. Green
@@ -470,7 +470,7 @@
                         * Determine blk-ness.
                         */
                        if (stat(spec, &st) < 0) {
-                               warn(spec);
+                               warn("%s", spec);
                                continue;
                        }
                        if (S_ISBLK(st.st_mode))