summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2005-02-06 20:50:34 +0000
committerdsl <dsl@NetBSD.org>2005-02-06 20:50:34 +0000
commit6ffe77ddd27437ef2666eb4d7136e4cd26ef5c37 (patch)
treec427318d50a704c2fd1d2cc123b9568976ee6ef1 /usr.bin
parente77d2c6bcdea4890c1cb21983cb830a4a06cc4cf (diff)
Taking (out) the __P
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cmp/cmp.c13
-rw-r--r--usr.bin/cmp/extern.h10
-rw-r--r--usr.bin/cmp/misc.c11
-rw-r--r--usr.bin/cmp/regular.c10
-rw-r--r--usr.bin/cmp/special.c9
5 files changed, 21 insertions, 32 deletions
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index c1074350592..beded383057 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.13 2003/08/07 11:13:22 agc Exp $ */
+/* $NetBSD: cmp.c,v 1.14 2005/02/06 20:50:34 dsl Exp $ */
/*
* Copyright (c) 1987, 1990, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cmp.c,v 1.13 2003/08/07 11:13:22 agc Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.14 2005/02/06 20:50:34 dsl Exp $");
#endif
#endif /* not lint */
@@ -58,13 +58,10 @@ __RCSID("$NetBSD: cmp.c,v 1.13 2003/08/07 11:13:22 agc Exp $");
int lflag, sflag;
-int main __P((int, char **));
-static void usage __P((void));
+static void usage(void);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
struct stat sb1, sb2;
off_t skip1, skip2;
@@ -145,7 +142,7 @@ main(argc, argv)
}
static void
-usage()
+usage(void)
{
(void)fprintf(stderr,
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 369ce6f5fc3..8d51f858dcc 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.4 2003/08/07 11:13:22 agc Exp $ */
+/* $NetBSD: extern.h,v 1.5 2005/02/06 20:50:34 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -35,9 +35,9 @@
#define DIFF_EXIT 1
#define ERR_EXIT 2 /* error exit code */
-void c_regular __P((int, char *, off_t, off_t, int, char *, off_t, off_t));
-void c_special __P((int, char *, off_t, int, char *, off_t));
-void diffmsg __P((char *, char *, off_t, off_t));
-void eofmsg __P((char *));
+void c_regular(int, char *, off_t, off_t, int, char *, off_t, off_t);
+void c_special(int, char *, off_t, int, char *, off_t);
+void diffmsg(char *, char *, off_t, off_t);
+void eofmsg(char *);
extern int lflag, sflag;
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 68d514f127c..a8a0b4d81ee 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.7 2003/08/07 11:13:22 agc Exp $ */
+/* $NetBSD: misc.c,v 1.8 2005/02/06 20:50:34 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: misc.c,v 1.7 2003/08/07 11:13:22 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.8 2005/02/06 20:50:34 dsl Exp $");
#endif
#endif /* not lint */
@@ -47,8 +47,7 @@ __RCSID("$NetBSD: misc.c,v 1.7 2003/08/07 11:13:22 agc Exp $");
#include "extern.h"
void
-eofmsg(file)
- char *file;
+eofmsg(char *file)
{
if (!sflag)
warnx("EOF on %s", file);
@@ -56,9 +55,7 @@ eofmsg(file)
}
void
-diffmsg(file1, file2, byte, line)
- char *file1, *file2;
- off_t byte, line;
+diffmsg(char *file1, char *file2, off_t byte, off_t line)
{
if (!sflag)
(void)printf("%s %s differ: char %lld, line %lld\n",
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 5bfb94d8c40..da1ea483df8 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regular.c,v 1.12 2003/08/07 11:13:23 agc Exp $ */
+/* $NetBSD: regular.c,v 1.13 2005/02/06 20:50:34 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: regular.c,v 1.12 2003/08/07 11:13:23 agc Exp $");
+__RCSID("$NetBSD: regular.c,v 1.13 2005/02/06 20:50:34 dsl Exp $");
#endif
#endif /* not lint */
@@ -51,10 +51,8 @@ __RCSID("$NetBSD: regular.c,v 1.12 2003/08/07 11:13:23 agc Exp $");
#include "extern.h"
void
-c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
- int fd1, fd2;
- char *file1, *file2;
- off_t skip1, len1, skip2, len2;
+c_regular(int fd1, char *file1, off_t skip1, off_t len1,
+ int fd2, char *file2, off_t skip2, off_t len2)
{
u_char ch, *p1, *p2;
off_t byte, length, line;
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index f67cfd63672..0421d3cb6f0 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,4 @@
-/* $NetBSD: special.c,v 1.8 2003/08/07 11:13:23 agc Exp $ */
+/* $NetBSD: special.c,v 1.9 2005/02/06 20:50:34 dsl Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: special.c,v 1.8 2003/08/07 11:13:23 agc Exp $");
+__RCSID("$NetBSD: special.c,v 1.9 2005/02/06 20:50:34 dsl Exp $");
#endif
#endif /* not lint */
@@ -48,10 +48,7 @@ __RCSID("$NetBSD: special.c,v 1.8 2003/08/07 11:13:23 agc Exp $");
#include "extern.h"
void
-c_special(fd1, file1, skip1, fd2, file2, skip2)
- int fd1, fd2;
- char *file1, *file2;
- off_t skip1, skip2;
+c_special(int fd1, char *file1, off_t skip1, int fd2, char *file2, off_t skip2)
{
int ch1, ch2;
off_t byte, line;