Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/usr.sbin pullup (approved by releng-1-5)
details: https://anonhg.NetBSD.org/src/rev/8f07a8684718
branches: netbsd-1-5
changeset: 488775:8f07a8684718
user: itojun <itojun%NetBSD.org@localhost>
date: Thu Jul 27 16:25:17 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/usr.sbin/netgroup_mkdb/netgroup_mkdb.c 1.9 -> 1.10
/cvsroot/basesrc/usr.sbin/pwd_mkdb/pwd_mkdb.c 1.17 -> 1.18
/cvsroot/basesrc/usr.sbin/quotaon/quotaon.c 1.14 -> 1.15
/cvsroot/basesrc/usr.sbin/rdate/rdate.c 1.10 -> 1.11
/cvsroot/basesrc/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c 1.5 -> 1.6
/cvsroot/basesrc/usr.sbin/traceroute6/traceroute6.c 1.12 -> 1.13
/cvsroot/basesrc/usr.sbin/wsconscfg/wsconscfg.c 1.6 -> 1.7
/cvsroot/basesrc/usr.sbin/ypserv/revnetgroup/revnetgroup.c 1.7 -> 1.8
/cvsroot/basesrc/usr.sbin/ypserv/ypserv/ypserv.c 1.10 -> 1.11
diffstat:
usr.sbin/netgroup_mkdb/netgroup_mkdb.c | 8 ++++----
usr.sbin/pwd_mkdb/pwd_mkdb.c | 4 ++--
usr.sbin/quotaon/quotaon.c | 6 +++---
usr.sbin/rdate/rdate.c | 6 +++---
usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c | 4 ++--
usr.sbin/traceroute6/traceroute6.c | 12 ++++++------
usr.sbin/wsconscfg/wsconscfg.c | 4 ++--
usr.sbin/ypserv/revnetgroup/revnetgroup.c | 6 +++---
usr.sbin/ypserv/ypserv/ypserv.c | 6 +++---
9 files changed, 28 insertions(+), 28 deletions(-)
diffs (243 lines):
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/netgroup_mkdb/netgroup_mkdb.c
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netgroup_mkdb.c,v 1.9 1999/11/28 04:40:21 lukem Exp $ */
+/* $NetBSD: netgroup_mkdb.c,v 1.9.4.1 2000/07/27 16:25:17 itojun Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: netgroup_mkdb.c,v 1.9 1999/11/28 04:40:21 lukem Exp $");
+__RCSID("$NetBSD: netgroup_mkdb.c,v 1.9.4.1 2000/07/27 16:25:17 itojun Exp $");
#endif
#include <sys/types.h>
@@ -168,7 +168,7 @@
db = dbopen(buf, O_RDWR | O_CREAT | O_EXCL,
(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH), DB_HASH, NULL);
if (!db)
- err(1, buf);
+ err(1, "%s", buf);
ng_write(db, ndb, _NG_KEYBYNAME);
ng_rwrite(db, udb, _NG_KEYBYUSER);
@@ -215,7 +215,7 @@
/* Open the netgroup file */
if ((fp = fopen(fname, "r")) == NULL)
- err(1, fname);
+ err(1, "%s", fname);
db = dbopen(NULL, O_RDWR | O_CREAT | O_EXCL, 0, DB_HASH, NULL);
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/pwd_mkdb/pwd_mkdb.c
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c Thu Jul 27 16:25:17 2000 +0000
@@ -39,7 +39,7 @@
Copyright (c) 1991, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
__SCCSID("from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94");
-__RCSID("$NetBSD: pwd_mkdb.c,v 1.17 2000/01/23 19:59:33 mycroft Exp $");
+__RCSID("$NetBSD: pwd_mkdb.c,v 1.17.4.1 2000/07/27 16:25:17 itojun Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -503,7 +503,7 @@
char *name;
{
- warn(name);
+ warn("%s", name);
cleanup();
#ifdef think_about_this_a_while_longer
fputs("NOTE: possible inconsistencies between text files and databases\n", stderr);
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/quotaon/quotaon.c
--- a/usr.sbin/quotaon/quotaon.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/quotaon/quotaon.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: quotaon.c,v 1.13 1998/07/27 00:52:03 mycroft Exp $ */
+/* $NetBSD: quotaon.c,v 1.13.10.1 2000/07/27 16:25:17 itojun Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -46,7 +46,7 @@
#if 0
static char sccsid[] = "@(#)quotaon.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: quotaon.c,v 1.13 1998/07/27 00:52:03 mycroft Exp $");
+__RCSID("$NetBSD: quotaon.c,v 1.13.10.1 2000/07/27 16:25:17 itojun Exp $");
#endif
#endif /* not lint */
@@ -175,7 +175,7 @@
return (1);
if (offmode) {
if (quotactl(fs->fs_file, QCMD(Q_QUOTAOFF, type), 0, 0) < 0) {
- warn(fs->fs_file);
+ warn("%s", fs->fs_file);
return (1);
}
if (vflag)
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/rdate/rdate.c
--- a/usr.sbin/rdate/rdate.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/rdate/rdate.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rdate.c,v 1.10 2000/02/05 22:14:20 kleink Exp $ */
+/* $NetBSD: rdate.c,v 1.10.4.1 2000/07/27 16:25:17 itojun Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rdate.c,v 1.10 2000/02/05 22:14:20 kleink Exp $");
+__RCSID("$NetBSD: rdate.c,v 1.10.4.1 2000/07/27 16:25:17 itojun Exp $");
#endif/* lint */
#include <sys/types.h>
@@ -142,7 +142,7 @@
break;
}
if (s < 0)
- err(1, emsg);
+ err(1, "%s", emsg);
if (read(s, &tim, sizeof(time_t)) != sizeof(time_t))
err(1, "Could not read data");
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: yppasswdd_mkpw.c,v 1.4 1998/11/06 13:07:18 is Exp $ */
+/* $NetBSD: yppasswdd_mkpw.c,v 1.4.10.1 2000/07/27 16:25:18 itojun Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thorpej%NetBSD.ORG@localhost>
@@ -107,7 +107,7 @@
pfd = open(_PATH_MASTERPASSWD, O_RDONLY, 0);
if (pfd < 0) {
pw_abort();
- warnx(_PATH_MASTERPASSWD);
+ warnx("%s", _PATH_MASTERPASSWD);
RETURN(1);
}
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/traceroute6/traceroute6.c
--- a/usr.sbin/traceroute6/traceroute6.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/traceroute6/traceroute6.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute6.c,v 1.11.2.1 2000/07/03 22:39:00 thorpej Exp $ */
+/* $NetBSD: traceroute6.c,v 1.11.2.2 2000/07/27 16:25:18 itojun Exp $ */
/* $KAME: traceroute6.c,v 1.30 2000/06/30 18:56:01 itojun Exp $ */
/*
@@ -79,7 +79,7 @@
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: traceroute6.c,v 1.11.2.1 2000/07/03 22:39:00 thorpej Exp $");
+__RCSID("$NetBSD: traceroute6.c,v 1.11.2.2 2000/07/27 16:25:18 itojun Exp $");
#endif
#endif
@@ -604,9 +604,9 @@
* turned off.
*/
if (setpolicy(rcvsock, "in bypass") < 0)
- errx(1, ipsec_strerror());
+ errx(1, "%s", ipsec_strerror());
if (setpolicy(rcvsock, "out bypass") < 0)
- errx(1, ipsec_strerror());
+ errx(1, "%s", ipsec_strerror());
#else
{
int level = IPSEC_LEVEL_NONE;
@@ -678,9 +678,9 @@
* turned off.
*/
if (setpolicy(sndsock, "in bypass") < 0)
- errx(1, ipsec_strerror());
+ errx(1, "%s", ipsec_strerror());
if (setpolicy(sndsock, "out bypass") < 0)
- errx(1, ipsec_strerror());
+ errx(1, "%s", ipsec_strerror());
#else
{
int level = IPSEC_LEVEL_BYPASS;
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/wsconscfg/wsconscfg.c
--- a/usr.sbin/wsconscfg/wsconscfg.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/wsconscfg/wsconscfg.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconscfg.c,v 1.5 1999/11/10 16:34:58 drochner Exp $ */
+/* $NetBSD: wsconscfg.c,v 1.5.4.1 2000/07/27 16:25:18 itojun Exp $ */
/*
* Copyright (c) 1999
@@ -119,7 +119,7 @@
wsfd = open(wsdev, O_RDWR, 0);
if (wsfd < 0)
- err(2, wsdev);
+ err(2, "%s", wsdev);
if (kbd) {
if (mux)
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/ypserv/revnetgroup/revnetgroup.c
--- a/usr.sbin/ypserv/revnetgroup/revnetgroup.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/ypserv/revnetgroup/revnetgroup.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: revnetgroup.c,v 1.7 1999/07/25 09:01:05 lukem Exp $ */
+/* $NetBSD: revnetgroup.c,v 1.7.8.1 2000/07/27 16:25:18 itojun Exp $ */
/*
* Copyright (c) 1995
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: revnetgroup.c,v 1.7 1999/07/25 09:01:05 lukem Exp $");
+__RCSID("$NetBSD: revnetgroup.c,v 1.7.8.1 2000/07/27 16:25:18 itojun Exp $");
#endif
#include <ctype.h>
@@ -129,7 +129,7 @@
if (strcmp(netgroup, "-")) {
if ((fp = fopen(netgroup, "r")) == NULL) {
- err(1,netgroup);
+ err(1, "%s", netgroup);
}
} else {
fp = stdin;
diff -r 362630ea3ba4 -r 8f07a8684718 usr.sbin/ypserv/ypserv/ypserv.c
--- a/usr.sbin/ypserv/ypserv/ypserv.c Thu Jul 27 16:15:27 2000 +0000
+++ b/usr.sbin/ypserv/ypserv/ypserv.c Thu Jul 27 16:25:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv.c,v 1.10 1999/06/06 02:43:05 thorpej Exp $ */
+/* $NetBSD: ypserv.c,v 1.10.8.1 2000/07/27 16:25:18 itojun Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj%stacken.kth.se@localhost>
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ypserv.c,v 1.10 1999/06/06 02:43:05 thorpej Exp $");
+__RCSID("$NetBSD: ypserv.c,v 1.10.8.1 2000/07/27 16:25:18 itojun Exp $");
#endif
#include <sys/types.h>
@@ -107,7 +107,7 @@
if (foreground && ! _rpcpmstart)
warnx("%s", msg);
else
- syslog(LOG_ERR, msg);
+ syslog(LOG_ERR, "%s", msg);
}
static void
Home |
Main Index |
Thread Index |
Old Index