Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format string cleanups by Bill Sommerfeld.

Browse Source
This commit is contained in:
is 2000-10-10 20:24:49 +00:00
parent 489b832f9b
commit 9979da6cbb
22 changed files with 109 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.13 1998/03/02 22:03:11 cgd Exp $
# $NetBSD: Makefile.inc,v 1.14 2000/10/10 20:24:49 is Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
.include <bsd.own.mk> # for LDSTATIC def'n
@ -6,3 +6,4 @@
WARNS?= 1
BINDIR?= /sbin
LDSTATIC?= -static
WFORMAT?= 2

22
sbin/atactl/atactl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atactl.c,v 1.9 2000/07/13 11:24:40 ad Exp $ */
/* $NetBSD: atactl.c,v 1.10 2000/10/10 20:24:50 is Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@ struct bitinfo {
int main __P((int, char *[]));
void usage __P((void));
void ata_command __P((struct atareq *));
void print_bitinfo __P((const char *, u_int, struct bitinfo *));
void print_bitinfo __P((const char *, const char *, u_int, struct bitinfo *));
int fd; /* file descriptor for device */
const char *dvname; /* device name */
@ -259,15 +259,15 @@ ata_command(req)
*/
void
print_bitinfo(f, bits, binfo)
const char *f;
print_bitinfo(bf, af, bits, binfo)
const char *bf, *af;
u_int bits;
struct bitinfo *binfo;
{
for (; binfo->bitmask != NULL; binfo++)
if (bits & binfo->bitmask)
printf(f, binfo->string);
printf("%s%s%s", bf, binfo->string, af);
}
/*
@ -380,28 +380,28 @@ device_identify(argc, argv)
inqbuf->atap_queuedepth & 0xf);
printf("Device capabilities:\n");
print_bitinfo("\t%s\n", inqbuf->atap_capabilities1, ata_caps);
print_bitinfo("\t", "\n", inqbuf->atap_capabilities1, ata_caps);
if (inqbuf->atap_ata_major != 0 && inqbuf->atap_ata_major != 0xffff) {
printf("Device supports following standards:\n");
print_bitinfo("%s ", inqbuf->atap_ata_major, ata_vers);
print_bitinfo("", " ", inqbuf->atap_ata_major, ata_vers);
printf("\n");
}
if (inqbuf->atap_cmd_set1 != 0 && inqbuf->atap_cmd_set1 != 0xffff &&
inqbuf->atap_cmd_set2 != 0 && inqbuf->atap_cmd_set2 != 0xffff) {
printf("Command set support:\n");
print_bitinfo("\t%s\n", inqbuf->atap_cmd_set1, ata_cmd_set1);
print_bitinfo("\t%s\n", inqbuf->atap_cmd_set2, ata_cmd_set2);
print_bitinfo("\t", "\n", inqbuf->atap_cmd_set1, ata_cmd_set1);
print_bitinfo("\t", "\n", inqbuf->atap_cmd_set2, ata_cmd_set2);
}
if (inqbuf->atap_cmd_def != 0 && inqbuf->atap_cmd_def != 0xffff) {
printf("Command sets/features enabled:\n");
print_bitinfo("\t%s\n", inqbuf->atap_cmd_set1 &
print_bitinfo("\t", "\n", inqbuf->atap_cmd_set1 &
(WDC_CMD1_SRV | WDC_CMD1_RLSE | WDC_CMD1_AHEAD |
WDC_CMD1_CACHE | WDC_CMD1_SEC | WDC_CMD1_SMART),
ata_cmd_set1);
print_bitinfo("\t%s\n", inqbuf->atap_cmd_set2 &
print_bitinfo("\t", "\n", inqbuf->atap_cmd_set2 &
(WDC_CMD2_RMSN | ATA_CMD2_APM), ata_cmd_set2);
}

7
sbin/ccdconfig/ccdconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccdconfig.c,v 1.31 2000/07/07 12:29:09 itojun Exp $ */
/* $NetBSD: ccdconfig.c,v 1.32 2000/10/10 20:24:50 is 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.31 2000/07/07 12:29:09 itojun Exp $");
__RCSID("$NetBSD: ccdconfig.c,v 1.32 2000/10/10 20:24:50 is Exp $");
#endif
#include <sys/param.h>
@ -650,7 +650,8 @@ print_ccd_info(cs, kd)
warnx("%s", kvm_geterr(kd));
goto done;
}
printf((i + 1 < cs->sc_nccdisks) ? "%s " : "%s\n", path);
fputs(path, stdout);
fputc((i + 1 < cs->sc_nccdisks) ? ' ' : '\n', stdout);
fflush(stdout);
}

32
sbin/disklabel/disklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.c,v 1.88 2000/10/08 23:32:50 christos Exp $ */
/* $NetBSD: disklabel.c,v 1.89 2000/10/10 20:24:50 is Exp $ */
/*
* Copyright (c) 1987, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
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.88 2000/10/08 23:32:50 christos Exp $");
__RCSID("$NetBSD: disklabel.c,v 1.89 2000/10/10 20:24:50 is Exp $");
#endif
#endif /* not lint */
@ -1889,20 +1889,20 @@ usage()
char *name;
char *expn;
} usages[] = {
{ "%s [-rt] [-C] disk",
{ "[-rt] [-C] disk",
"(to read label)" },
{ "%s -w [-r] [-f disktab] disk type [ packid ]",
{ "-w [-r] [-f disktab] disk type [ packid ]",
#if NUMBOOT > 0
"(to write label with existing boot program)"
#else
"(to write label)"
#endif
},
{ "%s -e [-r] [-I] [-C] disk",
{ "-e [-r] [-I] [-C] disk",
"(to edit label)" },
{ "%s -i [-I] [-r] disk",
{ "-i [-I] [-r] disk",
"(to create a label interactively)" },
{ "%s -R [-r] disk protofile",
{ "-R [-r] disk protofile",
#if NUMBOOT > 0
"(to restore label with existing boot program)"
#else
@ -1911,22 +1911,22 @@ usage()
},
#if NUMBOOT > 0
# if NUMBOOT > 1
{ "%s -B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk [ type ]",
{ "-B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk [ type ]",
"(to install boot program with existing label)" },
{ "%s -w -B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk type [ packid ]",
{ "-w -B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk type [ packid ]",
"(to write label and boot program)" },
{ "%s -R -B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk protofile [ type ]",
{ "-R -B [-f disktab] [ -b xxboot [ -s bootxx ] ] disk protofile [ type ]",
"(to restore label and boot program)" },
# else
{ "%s -B [-f disktab] [ -b bootprog ] disk [ type ]",
{ "-B [-f disktab] [ -b bootprog ] disk [ type ]",
"(to install boot program with existing on-disk label)" },
{ "%s -w -B [-f disktab] [ -b bootprog ] disk type [ packid ]",
{ "-w -B [-f disktab] [ -b bootprog ] disk type [ packid ]",
"(to write label and install boot program)" },
{ "%s -R -B [-f disktab] [ -b bootprog ] disk protofile [ type ]",
{ "-R -B [-f disktab] [ -b bootprog ] disk protofile [ type ]",
"(to restore label and install boot program)" },
# endif
#endif
{ "%s [-NW] disk",
{ "[-NW] disk",
"(to write disable/enable label)" },
{ NULL,
NULL }
@ -1935,9 +1935,9 @@ usage()
for (i = 0; usages[i].name; i++) {
(void) fputs(i ? "or " : "Usage: ", stderr);
(void) fprintf(stderr, usages[i].name, __progname);
(void) fprintf(stderr, "%s %s", __progname, usages[i].name);
(void) fputs("\n\t", stderr);
(void) fprintf(stderr, usages[i].expn, __progname);
(void) fprintf(stderr, "%s %s", __progname, usages[i].expn);
(void) fputs("\n", stderr);
}
exit(1);

8
sbin/dump/dump.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dump.h,v 1.19 1999/10/01 04:35:22 perseant Exp $ */
/* $NetBSD: dump.h,v 1.20 2000/10/10 20:24:50 is Exp $ */
/*-
* Copyright (c) 1980, 1993
@ -160,10 +160,10 @@ ino_t fs_maxino __P((void));
/* operator interface functions */
void broadcast __P((char *message));
void lastdump __P((int arg)); /* int should be char */
void msg __P((const char *fmt, ...));
void msgtail __P((const char *fmt, ...));
void msg __P((const char *fmt, ...)) __attribute__((__format__(__printf__,1,2)));
void msgtail __P((const char *fmt, ...)) __attribute__((__format__(__printf__,1,2)));
int query __P((char *question));
void quit __P((const char *fmt, ...));
void quit __P((const char *fmt, ...)) __attribute__((__format__(__printf__,1,2)));
void set_operators __P((void));
time_t do_stats __P((void));
void statussig __P((int));

10
sbin/dump/optr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: optr.c,v 1.13 1998/04/01 16:15:40 kleink Exp $ */
/* $NetBSD: optr.c,v 1.14 2000/10/10 20:24:50 is Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#else
__RCSID("$NetBSD: optr.c,v 1.13 1998/04/01 16:15:40 kleink Exp $");
__RCSID("$NetBSD: optr.c,v 1.14 2000/10/10 20:24:50 is Exp $");
#endif
#endif /* not lint */
@ -325,9 +325,9 @@ timeest()
deltat = tstart_writing - tnow +
(1.0 * (tnow - tstart_writing))
/ blockswritten * tapesize;
msg("%3.2f%% done, finished in %d:%02d\n",
(blockswritten * 100.0) / tapesize,
deltat / 3600, (deltat % 3600) / 60);
msg("%3.2f%% done, finished in %ld:%02ld\n",
(blockswritten * 100.0) / tapesize,
(long)(deltat / 3600), (long)((deltat % 3600) / 60));
}
}

7
sbin/fsck/fsutil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $ */
/* $NetBSD: fsutil.c,v 1.8 2000/10/10 20:24:51 is Exp $ */
/*
* Copyright (c) 1990, 1993
@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $");
__RCSID("$NetBSD: fsutil.c,v 1.8 2000/10/10 20:24:51 is Exp $");
#endif /* not lint */
#include <stdio.h>
@ -61,7 +61,8 @@ static int preen = 0;
extern char *__progname;
static void vmsg __P((int, const char *, va_list));
static void vmsg __P((int, const char *, va_list))
__attribute((__format__(__printf__,2,0)));
void
setcdevname(cd, pr)

6
sbin/fsck_ext2fs/utilities.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utilities.c,v 1.4 1998/03/30 02:07:59 mrg Exp $ */
/* $NetBSD: utilities.c,v 1.5 2000/10/10 20:24:51 is Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93";
#else
__RCSID("$NetBSD: utilities.c,v 1.4 1998/03/30 02:07:59 mrg Exp $");
__RCSID("$NetBSD: utilities.c,v 1.5 2000/10/10 20:24:51 is Exp $");
#endif
#endif /* not lint */
@ -510,7 +510,7 @@ dofix(idesc, msg)
if (idesc->id_type == DATA)
direrror(idesc->id_number, msg);
else
pwarn(msg);
pwarn("%s", msg);
if (preen) {
printf(" (SALVAGED)\n");
idesc->id_fix = FIX;

6
sbin/fsck_ffs/utilities.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utilities.c,v 1.26 1999/11/15 19:18:26 fvdl Exp $ */
/* $NetBSD: utilities.c,v 1.27 2000/10/10 20:24:51 is Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
#else
__RCSID("$NetBSD: utilities.c,v 1.26 1999/11/15 19:18:26 fvdl Exp $");
__RCSID("$NetBSD: utilities.c,v 1.27 2000/10/10 20:24:51 is Exp $");
#endif
#endif /* not lint */
@ -579,7 +579,7 @@ dofix(idesc, msg)
if (idesc->id_type == DATA)
direrror(idesc->id_number, msg);
else
pwarn(msg);
pwarn("%s", msg);
if (preen) {
printf(" (SALVAGED)\n");
idesc->id_fix = FIX;

4
sbin/fsck_lfs/utilities.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utilities.c,v 1.5 2000/06/14 18:44:00 perseant Exp $ */
/* $NetBSD: utilities.c,v 1.6 2000/10/10 20:24:51 is Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -538,7 +538,7 @@ dofix(struct inodesc * idesc, char *msg)
if (idesc->id_type == DATA)
direrror(idesc->id_number, msg);
else
pwarn(msg);
pwarn("%s", msg);
if (preen) {
printf(" (SALVAGED)\n");
idesc->id_fix = FIX;

4
sbin/fsck_msdos/ext.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $ */
/* $NetBSD: ext.h,v 1.7 2000/10/10 20:24:51 is Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@ -56,7 +56,7 @@ extern struct dosDirEntry *rootDir;
/*
* function declarations
*/
int ask __P((int, const char *, ...));
int ask __P((int, const char *, ...)) __attribute__((__format__(__printf__,2,3)));
/*
* Check filesystem given as arg

19
sbin/fsck_msdos/fat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fat.c,v 1.11 2000/04/26 16:45:02 jdolecek Exp $ */
/* $NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: fat.c,v 1.11 2000/04/26 16:45:02 jdolecek Exp $");
__RCSID("$NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $");
#endif /* not lint */
#include <stdlib.h>
@ -160,7 +160,6 @@ readfat(fs, boot, no, fp)
&& ((buffer[3]&0x0f) != 0x0f
|| buffer[4] != 0xff || buffer[5] != 0xff
|| buffer[6] != 0xff || (buffer[7]&0x0f) != 0x0f))) {
const char *msg;
/* Windows 95 OSR2 (and possibly any later) changes
* the FAT signature to 0xXXffff7f for FAT16 and to
@ -181,19 +180,21 @@ readfat(fs, boot, no, fp)
switch (boot->ClustMask) {
case CLUST32_MASK:
msg = "%s (%02x%02x%02x%02x%02x%02x%02x%02x)\n";
pwarn("%s (%02x%02x%02x%02x%02x%02x%02x%02x)\n",
"FAT starts with odd byte sequence",
buffer[0], buffer[1], buffer[2], buffer[3],
buffer[4], buffer[5], buffer[6], buffer[7]);
break;
case CLUST16_MASK:
msg = "%s (%02x%02x%02x%02x)\n";
pwarn("%s (%02x%02x%02x%02x)\n", "FAT starts with odd byte sequence",
buffer[0], buffer[1], buffer[2], buffer[3]);
break;
default:
msg = "%s (%02x%02x%02x)\n";
pwarn("%s (%02x%02x%02x)\n", "FAT starts with odd byte sequence",
buffer[0], buffer[1], buffer[2]);
break;
}
pwarn(msg, "FAT starts with odd byte sequence",
buffer[0], buffer[1], buffer[2], buffer[3],
buffer[4], buffer[5], buffer[6], buffer[7]);
if (ask(1, "Correct"))
ret |= FSFIXFAT;

6
sbin/fsdb/fsdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fsdb.c,v 1.16 1999/03/09 16:11:47 bouyer Exp $ */
/* $NetBSD: fsdb.c,v 1.17 2000/10/10 20:24:52 is Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: fsdb.c,v 1.16 1999/03/09 16:11:47 bouyer Exp $");
__RCSID("$NetBSD: fsdb.c,v 1.17 2000/10/10 20:24:52 is Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -487,7 +487,7 @@ print_blks(buf, size, blknum)
}
if (chars == 0)
printf("%d: ", *blknum);
printf(prbuf);
printf("%s", prbuf);
chars += strlen(prbuf);
}
printf("\n");

6
sbin/mount/mount.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mount.c,v 1.49 2000/10/02 18:52:47 abs Exp $ */
/* $NetBSD: mount.c,v 1.50 2000/10/10 20:24:52 is Exp $ */
/*
* Copyright (c) 1980, 1989, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#else
__RCSID("$NetBSD: mount.c,v 1.49 2000/10/02 18:52:47 abs Exp $");
__RCSID("$NetBSD: mount.c,v 1.50 2000/10/10 20:24:52 is Exp $");
#endif
#endif /* not lint */
@ -498,7 +498,7 @@ prmount(sfp)
(void)printf("%swrites: sync %ld async %ld)\n",
!f++ ? " (" : ", ", sfp->f_syncwrites, sfp->f_asyncwrites);
else
(void)printf(f ? ")\n" : "\n");
(void)printf("%s", f ? ")\n" : "\n");
}
struct statfs *

8
sbin/newfs/newfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newfs.c,v 1.38 1999/05/19 00:25:59 wrstuden Exp $ */
/* $NetBSD: newfs.c,v 1.39 2000/10/10 20:24:52 is Exp $ */
/*
* Copyright (c) 1983, 1989, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#else
__RCSID("$NetBSD: newfs.c,v 1.38 1999/05/19 00:25:59 wrstuden Exp $");
__RCSID("$NetBSD: newfs.c,v 1.39 2000/10/10 20:24:52 is Exp $");
#endif
#endif /* not lint */
@ -618,9 +618,9 @@ havelabel:
}
#ifdef COMPAT
char lmsg[] = "%s: can't read disk label; disk type must be specified";
const char lmsg[] = "%s: can't read disk label; disk type must be specified";
#else
char lmsg[] = "%s: can't read disk label";
const char lmsg[] = "%s: can't read disk label";
#endif
static struct disklabel *

5
sbin/newfs_lfs/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.2 2000/07/04 22:35:04 perseant Exp $ */
/* $NetBSD: extern.h,v 1.3 2000/10/10 20:24:52 is Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -40,7 +40,8 @@ struct dlfs;
u_long lfs_sb_cksum __P((struct dlfs *));
u_long cksum __P((void *, size_t));
u_short dkcksum __P((struct disklabel *));
void fatal __P((const char *fmt, ...));
void fatal __P((const char *fmt, ...))
__attribute__((__format__(__printf__,1,2)));
u_int log2 __P((u_int));
int make_lfs
__P((int, struct disklabel *, struct partition *, int,

21
sbin/ping/ping.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ping.c,v 1.56 2000/10/07 06:50:43 itojun Exp $ */
/* $NetBSD: ping.c,v 1.57 2000/10/10 20:24:53 is Exp $ */
/*
* Copyright (c) 1989, 1993
@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ping.c,v 1.56 2000/10/07 06:50:43 itojun Exp $");
__RCSID("$NetBSD: ping.c,v 1.57 2000/10/10 20:24:53 is Exp $");
#endif
#include <stdio.h>
@ -231,7 +231,7 @@ static void sec_to_timeval(const double, struct timeval *);
static double timeval_to_sec(const struct timeval *);
static void pr_pack(u_char *, int, struct sockaddr_in *);
static u_short in_cksum(u_short *, u_int);
static void pr_saddr(char *, u_char *);
static void pr_saddr(u_char *);
static char *pr_addr(struct in_addr *);
static void pr_iph(struct icmp *, int);
static void pr_retip(struct icmp *, int);
@ -547,7 +547,7 @@ main(int argc, char *argv[])
if (policy_in != NULL) {
buf = ipsec_set_policy(policy_in, strlen(policy_in));
if (buf == NULL)
errx(1, ipsec_strerror());
errx(1, "%s", ipsec_strerror());
if (setsockopt(s, IPPROTO_IP, IP_IPSEC_POLICY,
buf, ipsec_get_policylen(buf)) < 0) {
err(1, "ipsec policy cannot be configured");
@ -557,7 +557,7 @@ main(int argc, char *argv[])
if (policy_out != NULL) {
buf = ipsec_set_policy(policy_out, strlen(policy_out));
if (buf == NULL)
errx(1, ipsec_strerror());
errx(1, "%s", ipsec_strerror());
if (setsockopt(s, IPPROTO_IP, IP_IPSEC_POLICY,
buf, ipsec_get_policylen(buf)) < 0) {
err(1, "ipsec policy cannot be configured");
@ -567,7 +567,7 @@ main(int argc, char *argv[])
}
buf = ipsec_set_policy("out bypass", strlen("out bypass"));
if (buf == NULL)
errx(1, ipsec_strerror());
errx(1, "%s", ipsec_strerror());
if (setsockopt(sloop, IPPROTO_IP, IP_IPSEC_POLICY,
buf, ipsec_get_policylen(buf)) < 0) {
#if 0
@ -1075,7 +1075,7 @@ pr_pack(u_char *buf,
PR_PACK_SUB();
(void)printf("\nLSRR: ");
for (;;) {
pr_saddr("\t%s", cp);
pr_saddr(cp);
cp += 4;
hlen -= 4;
j -= 4;
@ -1114,7 +1114,7 @@ pr_pack(u_char *buf,
(void)printf("\nRR: ");
}
for (;;) {
pr_saddr("\t%s", cp);
pr_saddr(cp);
cp += 4;
hlen -= 4;
i -= 4;
@ -1631,8 +1631,7 @@ pr_iph(struct icmp *icp,
* Print an ASCII host address starting from a string of bytes.
*/
static void
pr_saddr(char *pat,
u_char *cp)
pr_saddr(u_char *cp)
{
n_long l;
struct in_addr addr;
@ -1642,7 +1641,7 @@ pr_saddr(char *pat,
l = (l<<8) + (u_char)*++cp;
l = (l<<8) + (u_char)*++cp;
addr.s_addr = htonl(l);
(void)printf(pat, (l == 0) ? "0.0.0.0" : pr_addr(&addr));
(void)printf("\t%s", (l == 0) ? "0.0.0.0" : pr_addr(&addr));
}

6
sbin/ping6/ping6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ping6.c,v 1.20 2000/10/08 00:26:38 itojun Exp $ */
/* $NetBSD: ping6.c,v 1.21 2000/10/10 20:24:53 is Exp $ */
/* $KAME: ping6.c,v 1.91 2000/10/07 06:23:06 itojun Exp $ */
/*
@ -81,7 +81,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#else
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ping6.c,v 1.20 2000/10/08 00:26:38 itojun Exp $");
__RCSID("$NetBSD: ping6.c,v 1.21 2000/10/10 20:24:53 is Exp $");
#endif
#endif
@ -787,7 +787,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(iaip->ai_addr)->sin6_family != AF_INET6)
errx(1,
"bad addr family of an intermediate addr");

4
sbin/raidctl/rf_configure.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_configure.c,v 1.10 2000/05/23 01:03:05 thorpej Exp $ */
/* $NetBSD: rf_configure.c,v 1.11 2000/10/10 20:24:53 is Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@ -426,7 +426,7 @@ rf_get_next_nonblank_line(buf, len, fp, errmsg)
return (0);
}
if (errmsg)
RF_ERRORMSG(errmsg);
RF_ERRORMSG1("%s", errmsg);
return (1);
}

8
sbin/restore/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.6 1997/09/15 08:04:30 lukem Exp $ */
/* $NetBSD: extern.h,v 1.7 2000/10/10 20:24:53 is Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -70,13 +70,15 @@ long listfile __P((char *, ino_t, int));
ino_t lowerbnd __P((ino_t));
void mktempname __P((struct entry *));
void moveentry __P((struct entry *, char *));
void msg __P((const char *, ...));
void msg __P((const char *, ...))
__attribute__((__format__(__printf__,1,2)));
char *myname __P((struct entry *));
void newnode __P((struct entry *));
void newtapebuf __P((long));
long nodeupdates __P((char *, ino_t, int));
void onintr __P((int));
void panic __P((const char *, ...));
void panic __P((const char *, ...))
__attribute__((__format__(__printf__,1,2)));
void pathcheck __P((char *));
struct direct *pathsearch __P((const char *));
void printdumpinfo __P((void));

13
sbin/route/show.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: show.c,v 1.14 1999/11/09 15:06:34 drochner Exp $ */
/* $NetBSD: show.c,v 1.15 2000/10/10 20:24:54 is Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
__RCSID("$NetBSD: show.c,v 1.14 1999/11/09 15:06:34 drochner Exp $");
__RCSID("$NetBSD: show.c,v 1.15 2000/10/10 20:24:54 is Exp $");
#endif
#endif /* not lint */
@ -98,7 +98,7 @@ static void pr_rthdr __P((void));
static void p_rtentry __P((struct rt_msghdr *));
static void pr_family __P((int));
static void p_sockaddr __P((struct sockaddr *, int, int ));
static void p_flags __P((int, char *));
static void p_flags __P((int));
/*
* Print routing tables.
@ -199,7 +199,7 @@ p_rtentry(rtm)
sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
p_sockaddr(sa, 0, WID_GW);
}
p_flags(rtm->rtm_flags & interesting, "%-6.6s ");
p_flags(rtm->rtm_flags & interesting);
putchar('\n');
}
@ -348,9 +348,8 @@ p_sockaddr(sa, flags, width)
}
static void
p_flags(f, format)
p_flags(f)
int f;
char *format;
{
char name[33], *flags;
const struct bits *p = bits;
@ -359,6 +358,6 @@ p_flags(f, format)
if (p->b_mask & f)
*flags++ = p->b_val;
*flags = '\0';
printf(format, name);
printf("%-6.6s ", name);
}

7
sbin/routed/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.24 2000/03/02 20:59:40 christos Exp $ */
/* $NetBSD: main.c,v 1.25 2000/10/10 20:24:54 is Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@ -38,7 +38,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)main.c 8.1 (Berkeley) 6/5/93
#define __COPYRIGHT(a) char copyright[] = a;
#elif defined(__NetBSD__)
#include <sys/cdefs.h>
__RCSID("$NetBSD: main.c,v 1.24 2000/03/02 20:59:40 christos Exp $");
__RCSID("$NetBSD: main.c,v 1.25 2000/10/10 20:24:54 is Exp $");
#endif
__COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n\
The Regents of the University of California. All rights reserved.\n");
@ -919,7 +919,8 @@ msglim(struct msg_limit *lim, naddr addr, const char *p, ...)
trace_flush();
for (p1 = p; *p1 == ' '; p1++)
continue;
vsyslog(LOG_ERR, p1, args);
p = p1;
vsyslog(LOG_ERR, p, args);
}
/* always display the message if tracing */