summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/brconfig/brconfig.c4
-rw-r--r--sbin/ccdconfig/ccdconfig.c8
-rw-r--r--sbin/disklabel/disklabel.c6
-rw-r--r--sbin/kbd/kbd_i386.c4
-rw-r--r--sbin/mount_nfs/mount_nfs.c4
-rw-r--r--sbin/ping6/ping6.c10
-rw-r--r--sbin/swapctl/swapctl.c4
-rw-r--r--sbin/sysctl/sysctl.c6
8 files changed, 23 insertions, 23 deletions
diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c
index 6e34b52a106..6d131839079 100644
--- a/sbin/brconfig/brconfig.c
+++ b/sbin/brconfig/brconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: brconfig.c,v 1.6 2000/02/04 06:32:04 deraadt Exp $ */
+/* $OpenBSD: brconfig.c,v 1.7 2000/06/30 16:00:08 millert Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -545,7 +545,7 @@ bridge_list(s, brdg, delim)
if (inbuf == NULL)
err(1, "malloc");
if (ioctl(s, SIOCBRDGIFS, &bifc) < 0)
- err(1, brdg);
+ err(1, "%s", brdg);
if (bifc.ifbic_len + sizeof(*reqp) < len)
break;
len *= 2;
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 3e842304cfb..a187a4da5ea 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccdconfig.c,v 1.12 1998/08/15 20:16:34 deraadt Exp $ */
+/* $OpenBSD: ccdconfig.c,v 1.13 2000/06/30 16:00:07 millert Exp $ */
/* $NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */
/*-
@@ -492,7 +492,7 @@ do_io(path, cmd, cciop)
#define KVM_ABORT(kd, str) { \
(void)kvm_close((kd)); \
warnx((str)); \
- warnx(kvm_geterr((kd))); \
+ warnx("%s", kvm_geterr((kd))); \
return (1); \
}
@@ -629,7 +629,7 @@ print_ccd_info(cs, kd)
readsize) != readsize) {
printf("\n");
warnx("can't read component info");
- warnx(kvm_geterr(kd));
+ warnx("%s", kvm_geterr(kd));
goto done;
}
@@ -639,7 +639,7 @@ print_ccd_info(cs, kd)
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 --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index aed8700bef1..f67ab2bdec9 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.68 1999/08/17 09:13:14 millert Exp $ */
+/* $OpenBSD: disklabel.c,v 1.69 2000/06/30 16:00:08 millert Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.68 1999/08/17 09:13:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.69 2000/06/30 16:00:08 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -732,7 +732,7 @@ readlabel(f)
msg = "disk label corrupted";
}
}
- warnx(msg);
+ warnx("%s", msg);
return(NULL);
} else {
if (cflag && ioctl(f, DIOCRLDINFO) < 0)
diff --git a/sbin/kbd/kbd_i386.c b/sbin/kbd/kbd_i386.c
index bcdb59a8ce4..290e3cb4193 100644
--- a/sbin/kbd/kbd_i386.c
+++ b/sbin/kbd/kbd_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd_i386.c,v 1.8 1998/07/06 13:42:26 pefo Exp $ */
+/* $OpenBSD: kbd_i386.c,v 1.9 2000/06/30 16:00:09 millert Exp $ */
/*
* Copyright (c) 1996 Juergen Hannken-Illjes
@@ -145,6 +145,6 @@ kbd_set(name, verbose)
snprintf(buf, sizeof(buf), "kcon -m %s", name);
if (system(buf))
- err(1, name);
+ err(1, "%s", name);
}
}
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 84d2406255f..59b5a8f84e5 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_nfs.c,v 1.17 1999/06/17 20:53:28 millert Exp $ */
+/* $OpenBSD: mount_nfs.c,v 1.18 2000/06/30 16:00:08 millert Exp $ */
/* $NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $ */
/*
@@ -437,7 +437,7 @@ main(argc, argv)
if (errno == EOPNOTSUPP)
errx(1, "%s: Filesystem not supported by kernel", name);
else
- err(1, name);
+ err(1, "%s", name);
}
if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
if ((opflags & ISBGRND) == 0) {
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index d8bc8cd27b9..c1b0edf3075 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.8 2000/06/20 20:00:03 itojun Exp $ */
+/* $OpenBSD: ping6.c,v 1.9 2000/06/30 16:00:10 millert Exp $ */
/* $KAME: ping6.c,v 1.55 2000/06/12 16:18:32 itojun Exp $ */
/*
@@ -554,9 +554,9 @@ main(argc, argv)
#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) {
@@ -734,7 +734,7 @@ main(argc, argv)
struct addrinfo *iaip;
if ((error = getaddrinfo(argv[hops], NULL, &hints, &iaip)))
- errx(1, gai_strerror(error));
+ errx(1, "%s", gai_strerror(error));
if (SIN6(res->ai_addr)->sin6_family != AF_INET6)
errx(1,
"bad addr family of an intermediate addr");
@@ -1912,7 +1912,7 @@ setpolicy(so, policy)
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 --git a/sbin/swapctl/swapctl.c b/sbin/swapctl/swapctl.c
index 1997cb0c3ee..78148c25006 100644
--- a/sbin/swapctl/swapctl.c
+++ b/sbin/swapctl/swapctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapctl.c,v 1.2 2000/02/26 04:06:23 hugh Exp $ */
+/* $OpenBSD: swapctl.c,v 1.3 2000/06/30 16:00:09 millert Exp $ */
/* $NetBSD: swapctl.c,v 1.9 1998/07/26 20:23:15 mycroft Exp $ */
/*
@@ -406,7 +406,7 @@ do_fstab()
* Determine blk-ness.
*/
if (stat(spec, &st) < 0) {
- warn(spec);
+ warn("%s", spec);
continue;
}
if (S_ISBLK(st.st_mode))
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 59f1c9e0488..cd583e05c28 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.52 2000/06/14 16:54:46 provos Exp $ */
+/* $OpenBSD: sysctl.c,v 1.53 2000/06/30 16:00:10 millert Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95";
#else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.52 2000/06/14 16:54:46 provos Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.53 2000/06/30 16:00:10 millert Exp $";
#endif
#endif /* not lint */
@@ -576,7 +576,7 @@ parse(string, flags)
if (special & BIOSGEO)
return;
default:
- warn(string);
+ warn("%s", string);
return;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:30:30 +0000