4 files changed, 9 insertions, 21 deletions

diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 7a60ee98c8d7..0032188f9b48 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -63,9 +63,7 @@ int	lflag, sflag, xflag, zflag;
 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;
@@ -169,7 +167,7 @@ main(argc, argv)
 }
 
 static void
-usage()
+usage(void)
 {
 
 	(void)fprintf(stderr,
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 1211f3b6f3b4..53c6a9bf6dd3 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 
 void
-eofmsg(file)
-	const char *file;
+eofmsg(const char *file)
 {
 	if (!sflag)
 		warnx("EOF on %s", file);
@@ -58,9 +57,7 @@ eofmsg(file)
 }
 
 void
-diffmsg(file1, file2, byte, line)
-	const char *file1, *file2;
-	off_t byte, line;
+diffmsg(const char *file1, const 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 982e1b5dadd6..7e38fcdf1c22 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -59,10 +59,8 @@ static u_char *remmap(u_char *, int, off_t);
 #define ROUNDPAGE(i) ((i) & ~pagemask)
 
 void
-c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
-	int fd1, fd2;
-	const char *file1, *file2;
-	off_t skip1, len1, skip2, len2;
+c_regular(int fd1, const char *file1, off_t skip1, off_t len1,
+    int fd2, const char *file2, off_t skip2, off_t len2)
 {
 	u_char ch, *p1, *p2, *m1, *m2, *e1, *e2;
 	off_t byte, length, line;
@@ -147,10 +145,7 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
 }
 
 static u_char *
-remmap(mem, fd, offset)
-	u_char  *mem;
-	int     fd;
-	off_t   offset;
+remmap(u_char *mem, int fd, off_t offset)
 {
 	if (mem != NULL)
 		munmap(mem, MMAP_CHUNK);
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index f08cae58fcb8..754013bf60b9 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -50,10 +50,8 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 
 void
-c_special(fd1, file1, skip1, fd2, file2, skip2)
-	int fd1, fd2;
-	const char *file1, *file2;
-	off_t skip1, skip2;
+c_special(int fd1, const char *file1, off_t skip1,
+    int fd2, const char *file2, off_t skip2)
 {
 	int ch1, ch2;
 	off_t byte, line;