Tue Jul 21 01:25:14 2009 UTC ()

Apply some ANSI and KNF.


(ahoka)

diff -r1.10 -r1.11 src/usr.bin/rev/rev.c

--- src/usr.bin/rev/rev.c 2009/07/21 01:12:55	1.10
+++ src/usr.bin/rev/rev.c 2009/07/21 01:25:14	1.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $	*/
+/*	$NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $	*/
 /*-
  * Copyright (c) 1987, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,55 +29,54 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1987, 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: rev.c,v 1.10 2009/07/21 01:12:55 ahoka Exp $");
+__RCSID("$NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <err.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <wchar.h>
-int	main __P((int, char **));
+static void usage(void);
-void	usage __P((void));
+int main(int, char *[]);
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char *argv[];
+{
 	const char *filename;
 	wchar_t *p, *t;
 	FILE *fp;
 	size_t len;
 	int ch, rval;
 	setlocale(LC_ALL, "");
 	setprogname(argv[0]);
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
 		case '?':
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	fp = stdin;
 	filename = "stdin";
 @@ -99,19 +98,19 @@ main(argc, argv)
 			for (t = p + len - 1; t >= p; --t)
 				putwchar(*t);
 			putwchar(L'\n');
+		}
 		if (ferror(fp)) {
 			warn("%s", filename);
 			rval = 1;
+		}
 		(void)fclose(fp);
 	} while(*argv);
 	exit(rval);
+}
-void
+static void
-usage()
+usage(void)
+{
-	(void)fprintf(stderr, "usage: rev [file ...]\n");
+	(void)fprintf(stderr, "usage: %s [file ...]\n", getprogname());
-	exit(1);
+	exit(EXIT_FAILURE);
+}