summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/atactl/atactl.c4
-rw-r--r--sbin/fsck/preen.c8
-rw-r--r--sbin/fsdb/fsdb.c10
-rw-r--r--sbin/fsdb/fsdbutil.c8
-rw-r--r--sbin/mount_tcfs/mount_tcfs.c4
-rw-r--r--sbin/ncheck_ffs/ncheck_ffs.c18
-rw-r--r--usr.bin/chpass/chpass.c6
-rw-r--r--usr.bin/error/main.c6
-rw-r--r--usr.bin/file/apprentice.c6
-rw-r--r--usr.bin/fstat/fstat.c6
-rw-r--r--usr.bin/hexdump/parse.c10
-rw-r--r--usr.bin/locate/locate/locate.c10
-rw-r--r--usr.bin/mail/fio.c6
-rw-r--r--usr.bin/midiplay/midiplay.c22
-rw-r--r--usr.bin/xlint/xlint/xlint.c6
-rw-r--r--usr.sbin/arp/arp.c6
-rw-r--r--usr.sbin/config/exec_aout.c6
-rw-r--r--usr.sbin/config/exec_ecoff.c6
-rw-r--r--usr.sbin/config/exec_elf.c6
-rw-r--r--usr.sbin/kgmon/kgmon.c8
-rw-r--r--usr.sbin/pkg_install/lib/str.c8
-rw-r--r--usr.sbin/tokeninit/tokeninit.c6
-rw-r--r--usr.sbin/user/user.c6
-rw-r--r--usr.sbin/wsmoused/wsmoused.c10
24 files changed, 96 insertions, 96 deletions
diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c
index c491927ac31..e4f3ef4beaf 100644
--- a/sbin/atactl/atactl.c
+++ b/sbin/atactl/atactl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atactl.c,v 1.10 2002/02/16 21:27:33 millert Exp $ */
+/* $OpenBSD: atactl.c,v 1.11 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: atactl.c,v 1.4 1999/02/24 18:49:14 jwise Exp $ */
/*-
@@ -241,7 +241,7 @@ main(argc, argv)
if (strcmp(cmdname, commands[i].cmd_name) == 0)
break;
if (commands[i].cmd_name == NULL)
- errx(1, "unknown command: %s\n", cmdname);
+ errx(1, "unknown command: %s", cmdname);
(*commands[i].cmd_func)(argc, argv);
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index d19b4174a29..746e85c614f 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: preen.c,v 1.8 2002/02/17 19:42:27 millert Exp $ */
+/* $OpenBSD: preen.c,v 1.9 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $ */
/*
@@ -105,7 +105,7 @@ checkfstab(flags, maxrun, docheck, checkit)
for (passno = 1; passno <= 2; passno++) {
if (setfsent() == 0) {
- warnx("Can't open checklist file: %s\n", _PATH_FSTAB);
+ warnx("Can't open checklist file: %s", _PATH_FSTAB);
return (8);
}
while ((fs = getfsent()) != 0) {
@@ -165,7 +165,7 @@ checkfstab(flags, maxrun, docheck, checkit)
break;
if (d == NULL) {
- warnx("Unknown pid %d\n", pid);
+ warnx("Unknown pid %d", pid);
continue;
}
@@ -307,7 +307,7 @@ addpart(type, devname, mntpt, auxarg)
for (p = d->d_part.tqh_first; p != NULL; p = p->p_entries.tqe_next)
if (strcmp(p->p_devname, devname) == 0) {
- warnx("%s in fstab more than once!\n", devname);
+ warnx("%s in fstab more than once!", devname);
return;
}
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 12d55d3f7eb..ec4c4e5ac55 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsdb.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: fsdb.c,v 1.10 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $ */
/*-
@@ -598,7 +598,7 @@ CMDFUNCSTART(chname)
if ((rval & (FOUND|ALTERED)) == (FOUND|ALTERED))
return 0;
else if (rval & FOUND) {
- warnx("new name `%s' does not fit in slot %s\n", argv[2], argv[1]);
+ warnx("new name `%s' does not fit in slot %s", argv[2], argv[1]);
return 1;
} else {
warnx("no %sth slot in current directory", argv[1]);
@@ -704,7 +704,7 @@ CMDFUNCSTART(chaflags)
}
if (flags > UINT_MAX) {
- warnx("flags set beyond 32-bit range of field (%lx)\n", flags);
+ warnx("flags set beyond 32-bit range of field (%lx)", flags);
return(1);
}
curinode->di_flags = flags;
@@ -729,7 +729,7 @@ CMDFUNCSTART(chgen)
}
if (gen > INT_MAX || gen < INT_MIN) {
- warnx("gen set beyond 32-bit range of field (%lx)\n", gen);
+ warnx("gen set beyond 32-bit range of field (%lx)", gen);
return(1);
}
curinode->di_gen = gen;
@@ -753,7 +753,7 @@ CMDFUNCSTART(linkcount)
return 1;
}
if (lcnt > USHRT_MAX || lcnt < 0) {
- warnx("max link count is %d\n", USHRT_MAX);
+ warnx("max link count is %d", USHRT_MAX);
return 1;
}
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index f31b9b2695f..713b128ad59 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsdbutil.c,v 1.6 2001/07/07 18:26:13 deraadt Exp $ */
+/* $OpenBSD: fsdbutil.c,v 1.7 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: fsdbutil.c,v 1.5 1996/09/28 19:30:37 christos Exp $ */
/*-
@@ -38,7 +38,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: fsdbutil.c,v 1.6 2001/07/07 18:26:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: fsdbutil.c,v 1.7 2002/03/14 06:51:41 mpech Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -171,7 +171,7 @@ int
checkactive()
{
if (!curinode) {
- warnx("no current inode\n");
+ warnx("no current inode");
return 0;
}
return 1;
@@ -181,7 +181,7 @@ int
checkactivedir()
{
if (!curinode) {
- warnx("no current inode\n");
+ warnx("no current inode");
return 0;
}
if ((curinode->di_mode & IFMT) != IFDIR) {
diff --git a/sbin/mount_tcfs/mount_tcfs.c b/sbin/mount_tcfs/mount_tcfs.c
index de3df97ad60..46eb1264d6d 100644
--- a/sbin/mount_tcfs/mount_tcfs.c
+++ b/sbin/mount_tcfs/mount_tcfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_tcfs.c,v 1.5 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_tcfs.c,v 1.6 2002/03/14 06:51:41 mpech Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -107,7 +107,7 @@ main(argc, argv)
argv[0], target, argv[1]);
if (args.cipher_num == -1)
- errx(1, "cipher number not found for filesystem %s\n",
+ errx(1, "cipher number not found for filesystem %s",
argv[1]);
args.target = target;
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 3d1bf1fef86..9ec14c08258 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: ncheck_ffs.c,v 1.10 2002/03/14 06:51:41 mpech Exp $ */
/*-
* Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -31,7 +31,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.10 2002/03/14 06:51:41 mpech Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -223,7 +223,7 @@ bread(blkno, buf, size)
loop:
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) < 0)
- warnx("bread: lseek fails\n");
+ warnx("bread: lseek fails");
if ((cnt = read(diskfd, buf, size)) == size)
return;
if (blkno + (size / dev_bsize) > fsbtodb(sblock, sblock->fs_size)) {
@@ -241,28 +241,28 @@ loop:
goto loop;
}
if (cnt == -1)
- warnx("read error from %s: %s: [block %d]: count=%d\n",
+ warnx("read error from %s: %s: [block %d]: count=%d",
disk, strerror(errno), blkno, size);
else
- warnx("short read error from %s: [block %d]: count=%d, got=%d\n",
+ warnx("short read error from %s: [block %d]: count=%d, got=%d",
disk, blkno, size, cnt);
if (++breaderrors > BREADEMAX)
- errx(1, "More than %d block read errors from %s\n", BREADEMAX, disk);
+ errx(1, "More than %d block read errors from %s", BREADEMAX, disk);
/*
* Zero buffer, then try to read each sector of buffer separately.
*/
memset(buf, 0, size);
for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) < 0)
- warnx("bread: lseek2 fails!\n");
+ warnx("bread: lseek2 fails!");
if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
continue;
if (cnt == -1) {
- warnx("read error from %s: %s: [sector %d]: count=%ld\n",
+ warnx("read error from %s: %s: [sector %d]: count=%ld",
disk, strerror(errno), blkno, dev_bsize);
continue;
}
- warnx("short read error from %s: [sector %d]: count=%ld, got=%d\n",
+ warnx("short read error from %s: [sector %d]: count=%ld, got=%d",
disk, blkno, dev_bsize, cnt);
}
}
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 9958e511cff..494a2647002 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: chpass.c,v 1.22 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.22 2002/03/14 06:51:41 mpech Exp $";
#endif
#endif /* not lint */
@@ -148,7 +148,7 @@ main(argc, argv)
pw = ypgetpwuid(uid);
#endif /* YP */
if (!pw)
- errx(1, "unknown user: uid %u\n", uid);
+ errx(1, "unknown user: uid %u", uid);
break;
case 1:
pw = getpwnam(*argv);
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index fbf498fb412..a52912f2e94 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.6 2001/07/12 05:17:02 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.7 2002/03/14 06:51:41 mpech Exp $ */
/* $NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.6 2001/07/12 05:17:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.7 2002/03/14 06:51:41 mpech Exp $";
#endif /* not lint */
#include <signal.h>
@@ -171,7 +171,7 @@ main(argc, argv)
if (argc > 1) {
if (argc > 3)
- errx(3, "Only takes 0 or 1 arguments.\n");
+ errx(3, "Only takes 0 or 1 arguments.");
if ((errorfile = fopen(argv[1], "r")) == NULL)
err(4, "%s", argv[1]);
}
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index c6bc2814c6a..e484243bec1 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apprentice.c,v 1.12 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: apprentice.c,v 1.13 2002/03/14 06:51:41 mpech Exp $ */
/*
* apprentice - make one pass through /etc/magic, learning its secrets.
@@ -36,7 +36,7 @@
#include "file.h"
#ifndef lint
-static char *moduleid = "$OpenBSD: apprentice.c,v 1.12 2002/02/16 21:27:46 millert Exp $";
+static char *moduleid = "$OpenBSD: apprentice.c,v 1.13 2002/03/14 06:51:41 mpech Exp $";
#endif /* lint */
#define EATAB {while (isascii((unsigned char) *l) && \
@@ -164,7 +164,7 @@ uint32 v;
case STRING:
break;
default:
- warnx("can't happen: m->type=%d\n", m->type);
+ warnx("can't happen: m->type=%d", m->type);
return -1;
}
return v;
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index dc8c2f66c8b..cb42637b5cd 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fstat.c,v 1.35 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: fstat.c,v 1.36 2002/03/14 06:51:41 mpech Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: fstat.c,v 1.35 2002/02/16 21:27:46 millert Exp $";
+static char *rcsid = "$OpenBSD: fstat.c,v 1.36 2002/03/14 06:51:41 mpech Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -199,7 +199,7 @@ main(argc, argv)
if (pflg++)
usage();
if (!isdigit(*optarg)) {
- warnx( "-p requires a process id\n");
+ warnx( "-p requires a process id");
usage();
}
what = KERN_PROC_PID;
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index e3198ab99bb..a6a9e0b93c2 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $ */
+/* $OpenBSD: parse.c,v 1.10 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $ */
/*
@@ -36,7 +36,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)parse.c 5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.10 2002/03/14 06:51:42 mpech Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -502,19 +502,19 @@ badcnt(s)
void
badsfmt()
{
- errx(1, "%%s: requires a precision or a byte count\n");
+ errx(1, "%%s: requires a precision or a byte count");
}
void
badfmt(fmt)
const char *fmt;
{
- errx(1, "\"%s\": bad format\n", fmt);
+ errx(1, "\"%s\": bad format", fmt);
}
void
badconv(ch)
char *ch;
{
- errx(1, "%%%s: bad conversion character\n", ch);
+ errx(1, "%%%s: bad conversion character", ch);
}
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index d98dc88909a..18790a4c5ca 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $
+ * $OpenBSD: locate.c,v 1.13 2002/03/14 06:51:42 mpech Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $
+ * $Id: locate.c,v 1.13 2002/03/14 06:51:42 mpech Exp $
*/
#ifndef lint
@@ -50,7 +50,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.12 2002/02/17 19:42:31 millert Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.13 2002/03/14 06:51:42 mpech Exp $";
#endif
#endif /* not lint */
@@ -270,7 +270,7 @@ search_fopen(db, s)
#endif
if (!f_stdin &&
fseek(fp, (long)0, SEEK_SET) == -1)
- err(1, "fseek to begin of ``%s''\n", path_fcodes);
+ err(1, "fseek to begin of ``%s''", path_fcodes);
if (f_icase)
fastfind_icase(fp, *s, path_fcodes);
@@ -323,7 +323,7 @@ search_mmap(db, s)
}
if (munmap(p, (size_t)len) == -1)
- warn("munmap %s\n", path_fcodes);
+ warn("munmap %s", path_fcodes);
(void)close(fd);
}
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 8974869ab72..c22f73f71e9 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fio.c,v 1.21 2001/12/18 16:55:06 millert Exp $ */
+/* $OpenBSD: fio.c,v 1.22 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: fio.c,v 1.21 2001/12/18 16:55:06 millert Exp $";
+static const char rcsid[] = "$OpenBSD: fio.c,v 1.22 2002/03/14 06:51:42 mpech Exp $";
#endif
#endif /* not lint */
@@ -287,7 +287,7 @@ makemessage(FILE *f, int omsgCount)
size = (msgCount + 1) * sizeof(struct message);
nmessage = (struct message *)realloc(message, size);
if (nmessage == 0)
- errx(1, "Insufficient memory for %d messages\n",
+ errx(1, "Insufficient memory for %d messages",
msgCount);
if (omsgCount == 0 || message == NULL)
dot = nmessage;
diff --git a/usr.bin/midiplay/midiplay.c b/usr.bin/midiplay/midiplay.c
index 655f4f1df47..ecfe0a3d99e 100644
--- a/usr.bin/midiplay/midiplay.c
+++ b/usr.bin/midiplay/midiplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midiplay.c,v 1.2 2002/02/16 21:27:49 millert Exp $ */
+/* $OpenBSD: midiplay.c,v 1.3 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: midiplay.c,v 1.8 1998/11/25 22:17:07 augustss Exp $ */
/*
@@ -265,7 +265,7 @@ playfile(f, name)
size = 1000;
buf = malloc(size);
if (buf == 0)
- errx(1, "malloc() failed\n");
+ errx(1, "malloc() failed");
nread = size;
tot = 0;
for (;;) {
@@ -278,7 +278,7 @@ playfile(f, name)
size *= 2;
buf = realloc(buf, size);
if (buf == NULL)
- errx(1, "realloc() failed\n");
+ errx(1, "realloc() failed");
}
playdata(buf, tot, name);
free(buf);
@@ -303,11 +303,11 @@ playdata(buf, tot, name)
printf("Playing %s (%d bytes) ... \n", name, tot);
if (memcmp(buf, MARK_HEADER, MARK_LEN) != 0) {
- warnx("Not a MIDI file, missing header\n");
+ warnx("Not a MIDI file, missing header");
return;
}
if (GET32(buf + MARK_LEN) != HEADER_LEN) {
- warnx("Not a MIDI file, bad header\n");
+ warnx("Not a MIDI file, bad header");
return;
}
format = GET16(buf + MARK_LEN + SIZE_LEN);
@@ -318,27 +318,27 @@ playdata(buf, tot, name)
if ((divfmt & 0x80) == 0)
ticks |= divfmt << 8;
else
- errx(1, "Absolute time codes not implemented yet\n");
+ errx(1, "Absolute time codes not implemented yet");
if (verbose > 1)
printf("format=%d ntrks=%d divfmt=%x ticks=%d\n",
format, ntrks, divfmt, ticks);
if (format != 0 && format != 1) {
- warnx("Cannnot play MIDI file of type %d\n", format);
+ warnx("Cannnot play MIDI file of type %d", format);
return;
}
if (ntrks == 0)
return;
tracks = malloc(ntrks * sizeof(struct track));
if (tracks == NULL)
- errx(1, "malloc() tracks failed\n");
+ errx(1, "malloc() tracks failed");
for (t = 0; t < ntrks; ) {
if (p >= end - MARK_LEN - SIZE_LEN) {
- warnx("Cannot find track %d\n", t);
+ warnx("Cannot find track %d", t);
goto ret;
}
len = GET32(p + MARK_LEN);
if (len > 1000000) { /* a safe guard */
- warnx("Crazy track length\n");
+ warnx("Crazy track length");
goto ret;
}
if (memcmp(p, MARK_TRACK, MARK_LEN) == 0) {
@@ -539,7 +539,7 @@ main(argc, argv)
if (ioctl(fd, SEQUENCER_NRMIDIS, &nmidi) < 0)
err(1, "ioctl(SEQUENCER_NRMIDIS) failed, ");
if (nmidi == 0)
- errx(1, "Sorry, no MIDI devices available\n");
+ errx(1, "Sorry, no MIDI devices available");
if (listdevs) {
for (info.device = 0; info.device < nmidi; info.device++) {
if (ioctl(fd, SEQUENCER_INFO, &info) < 0)
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 54201383c34..6386b5c8063 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xlint.c,v 1.8 2002/02/16 21:27:59 millert Exp $ */
+/* $OpenBSD: xlint.c,v 1.9 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: xlint.c,v 1.3 1995/10/23 14:29:30 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: xlint.c,v 1.8 2002/02/16 21:27:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: xlint.c,v 1.9 2002/03/14 06:51:42 mpech Exp $";
#endif
#include <sys/param.h>
@@ -541,7 +541,7 @@ fname(name, last)
if (strcmp(suff, "c") != 0 &&
(strncmp(bn, "llib-l", 6) != 0 || bn != suff)) {
- warnx("unknown file type: %s\n", name);
+ warnx("unknown file type: %s", name);
return;
}
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index f8db75e98ad..6e4c0ee6c6d 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: arp.c,v 1.20 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
/*
@@ -45,7 +45,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)arp.c 8.2 (Berkeley) 1/2/94";*/
-static char *rcsid = "$OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $";
+static char *rcsid = "$OpenBSD: arp.c,v 1.20 2002/03/14 06:51:42 mpech Exp $";
#endif /* not lint */
/*
@@ -260,7 +260,7 @@ set(argc, argv)
return (1);
ea = ether_aton(eaddr);
if (ea == NULL)
- errx(1, "invalid ethernet address: %s\n", eaddr);
+ errx(1, "invalid ethernet address: %s", eaddr);
memcpy(LLADDR(&sdl_m), ea, sizeof(*ea));
sdl_m.sdl_alen = 6;
doing_proxy = flags = export_only = expire_time = 0;
diff --git a/usr.sbin/config/exec_aout.c b/usr.sbin/config/exec_aout.c
index c481b455aaf..80b9dbf97d6 100644
--- a/usr.sbin/config/exec_aout.c
+++ b/usr.sbin/config/exec_aout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_aout.c,v 1.3 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: exec_aout.c,v 1.4 2002/03/14 06:51:42 mpech Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.3 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.4 2002/03/14 06:51:42 mpech Exp $";
#endif
#include <err.h>
@@ -104,7 +104,7 @@ aout_loadkernel(file)
errx(1, "can't read a.out header");
if (N_BADMAG(aout_ex))
- errx(1, "bad a.out magic\n");
+ errx(1, "bad a.out magic");
(void)lseek(fd, (off_t)0, SEEK_SET);
diff --git a/usr.sbin/config/exec_ecoff.c b/usr.sbin/config/exec_ecoff.c
index 6bffbbe691e..ba5791967fd 100644
--- a/usr.sbin/config/exec_ecoff.c
+++ b/usr.sbin/config/exec_ecoff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_ecoff.c,v 1.5 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: exec_ecoff.c,v 1.6 2002/03/14 06:51:42 mpech Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.5 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.6 2002/03/14 06:51:42 mpech Exp $";
#endif
#include <err.h>
@@ -107,7 +107,7 @@ ecoff_loadkernel(file)
errx(1, "can't read ecoff header");
if (ECOFF_BADMAG(&ecoff_ex))
- errx(1, "bad ecoff magic\n");
+ errx(1, "bad ecoff magic");
ecoff_psz = ecoff_ex.a.tsize + ecoff_ex.a.dsize;
beg = lseek(fd, ECOFF_TXTOFF(&ecoff_ex), SEEK_SET);
diff --git a/usr.sbin/config/exec_elf.c b/usr.sbin/config/exec_elf.c
index ce00480c342..3b96e841875 100644
--- a/usr.sbin/config/exec_elf.c
+++ b/usr.sbin/config/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.4 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.5 2002/03/14 06:51:42 mpech Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.4 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.5 2002/03/14 06:51:42 mpech Exp $";
#endif
#include <err.h>
@@ -135,7 +135,7 @@ elf_loadkernel(file)
errx(1, "can't read elf header");
if (!IS_ELF(elf_ex))
- errx(1, "bad elf magic\n");
+ errx(1, "bad elf magic");
elf_size = lseek(fd, 0L, SEEK_END);
(void)lseek(fd, 0L, SEEK_SET);
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index ded4251051f..84de6aa9a39 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $ */
+/* $OpenBSD: kgmon.c,v 1.8 2002/03/14 06:51:42 mpech Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)kgmon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $";
+static char *rcsid = "$OpenBSD: kgmon.c,v 1.8 2002/03/14 06:51:42 mpech Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -399,7 +399,7 @@ dumpstate(kvp)
for (toindex = froms[fromindex]; toindex != 0;
toindex = tos[toindex].link) {
if (debug)
- warnx("[mcleanup] frompc 0x%lx selfpc 0x%lx count %ld\n",
+ warnx("[mcleanup] frompc 0x%lx selfpc 0x%lx count %ld",
frompc, tos[toindex].selfpc, tos[toindex].count);
rawarc.raw_frompc = frompc;
rawarc.raw_selfpc = (u_long)tos[toindex].selfpc;
@@ -464,7 +464,7 @@ reset(kvp)
errx(13, "tickbuf zero: %s", kvm_geterr(kvp->kd));
if (kvm_write(kvp->kd, (u_long)kvp->gpm.froms, zbuf,
kvp->gpm.fromssize) != kvp->gpm.fromssize)
- errx(14, "froms zero: %s\n", kvm_geterr(kvp->kd));
+ errx(14, "froms zero: %s", kvm_geterr(kvp->kd));
if (kvm_write(kvp->kd, (u_long)kvp->gpm.tos, zbuf,
kvp->gpm.tossize) != kvp->gpm.tossize)
errx(15, "tos zero: %s", kvm_geterr(kvp->kd));
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index ef12746d43a..fe9e653910e 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: str.c,v 1.5 2001/04/08 16:45:48 espie Exp $ */
+/* $OpenBSD: str.c,v 1.6 2002/03/14 06:51:42 mpech Exp $ */
#ifndef lint
-static const char *rcsid = "$OpenBSD: str.c,v 1.5 2001/04/08 16:45:48 espie Exp $";
+static const char *rcsid = "$OpenBSD: str.c,v 1.6 2002/03/14 06:51:42 mpech Exp $";
#endif
/*
@@ -191,7 +191,7 @@ alternate_match(const char *pattern, const char *pkg)
int found;
if ((sep = strchr(pattern, '{')) == (char *) NULL) {
- errx(1, "alternate_match(): '{' expected in \"%s\"\n", pattern);
+ errx(1, "alternate_match(): '{' expected in \"%s\"", pattern);
}
(void) strncpy(buf, pattern, (size_t)(sep - pattern));
alt = &buf[sep - pattern];
@@ -238,7 +238,7 @@ dewey_match(const char *pattern, const char *pkg)
found = 0;
if ((sep = strpbrk(pattern, "<>")) == NULL)
- errx(1, "dewey_match(): '<' or '>' expexted in \"%s\"\n", pattern);
+ errx(1, "dewey_match(): '<' or '>' expexted in \"%s\"", pattern);
/* next three lines are static in loops, too (-> cache!) */
snprintf(name, sizeof(name), "%.*s", (int) (sep - pattern), pattern);
diff --git a/usr.sbin/tokeninit/tokeninit.c b/usr.sbin/tokeninit/tokeninit.c
index 2e56de30d05..79c50a51143 100644
--- a/usr.sbin/tokeninit/tokeninit.c
+++ b/usr.sbin/tokeninit/tokeninit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tokeninit.c,v 1.3 2001/10/24 13:06:36 mpech Exp $ */
+/* $OpenBSD: tokeninit.c,v 1.4 2002/03/14 06:51:42 mpech Exp $ */
/*-
* Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -154,14 +154,14 @@ main(int argc, char **argv)
*argv, tt->proper);
break;
case 1:
- warnx("%s already exists in %s database!\n",
+ warnx("%s already exists in %s database!",
*argv, tt->proper);
syslog(LOG_INFO, "%s already exists in %s database",
*argv, tt->proper);
errors++;
break;
case -1:
- warnx("Error initializing user %s in %s database.\n",
+ warnx("Error initializing user %s in %s database.",
*argv, tt->proper);
syslog(LOG_INFO,
"Error initializing user %s in %s database: %m",
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 9f2a59da66d..96e0aa4b81e 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.30 2002/03/05 17:30:15 millert Exp $ */
+/* $OpenBSD: user.c,v 1.31 2002/03/14 06:51:42 mpech Exp $ */
/* $NetBSD: user.c,v 1.45 2001/08/17 08:29:00 joda Exp $ */
/*
@@ -234,7 +234,7 @@ removehomedir(const char *user, uid_t uid, const char *dir)
/* userid matches directory owner? */
if (st.st_uid != uid) {
- warnx("User `%s' doesn't own directory `%s', not removed\n",
+ warnx("User `%s' doesn't own directory `%s', not removed",
user, dir);
return 0;
}
@@ -244,7 +244,7 @@ removehomedir(const char *user, uid_t uid, const char *dir)
(void) asystem("%s -rf %s > /dev/null 2>&1 || true", RM, dir);
(void) seteuid(0);
if (rmdir(dir) < 0) {
- warnx("Unable to remove all files in `%s'\n", dir);
+ warnx("Unable to remove all files in `%s'", dir);
return 0;
}
return 1;
diff --git a/usr.sbin/wsmoused/wsmoused.c b/usr.sbin/wsmoused/wsmoused.c
index 930c9e3003f..9ad291e12f0 100644
--- a/usr.sbin/wsmoused/wsmoused.c
+++ b/usr.sbin/wsmoused/wsmoused.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmoused.c,v 1.9 2002/02/15 02:18:39 deraadt Exp $ */
+/* $OpenBSD: wsmoused.c,v 1.10 2002/03/14 06:51:42 mpech Exp $ */
/*
* Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -136,7 +136,7 @@ wsmouse_identify(void)
break;
}
} else
- warnx("unable to open %s\n", mouse.portname);
+ warnx("unable to open %s", mouse.portname);
}
/* wsmouse_init : init a wsmouse compatible mouse */
@@ -487,7 +487,7 @@ main(int argc, char **argv)
}
if (mouse_names[i] != NULL)
break;
- warnx("no such mouse protocol `%s'\n", optarg);
+ warnx("no such mouse protocol `%s'", optarg);
usage();
break;
case 'C':
@@ -495,7 +495,7 @@ main(int argc, char **argv)
mouse.clickthreshold = atoi(optarg);
if (mouse.clickthreshold < 0 ||
mouse.clickthreshold > MAX_CLICKTHRESHOLD) {
- warnx("invalid threshold `%s': max value is %d\n",
+ warnx("invalid threshold `%s': max value is %d",
optarg, MAX_CLICKTHRESHOLD);
usage();
}
@@ -505,7 +505,7 @@ main(int argc, char **argv)
break;
case 'M':
if (!mouse_installmap(optarg)) {
- warnx("invalid mapping `%s'\n", optarg);
+ warnx("invalid mapping `%s'", optarg);
usage();
}
break;
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.