svn commit: r216422 - head/usr.bin/printf

Xin LI delphij at FreeBSD.org
Tue Dec 14 00:21:35 UTC 2010


Author: delphij
Date: Tue Dec 14 00:21:34 2010
New Revision: 216422
URL: http://svn.freebsd.org/changeset/base/216422

Log:
  Make use of EX_USAGE for usage().

Modified:
  head/usr.bin/printf/printf.c

Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c	Mon Dec 13 23:53:55 2010	(r216421)
+++ head/usr.bin/printf/printf.c	Tue Dec 14 00:21:34 2010	(r216422)
@@ -53,6 +53,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #ifdef SHELL
@@ -115,14 +116,14 @@ main(int argc, char *argv[])
 		case '?':
 		default:
 			usage();
-			return (1);
+			/* NOTREACHED */
 		}
 	argc -= optind;
 	argv += optind;
 
 	if (argc < 1) {
 		usage();
-		return (1);
+		/* NOTREACHED */
 	}
 
 #ifdef SHELL
@@ -562,4 +563,5 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: printf format [arguments ...]\n");
+	exit(EX_USAGE);
 }


More information about the svn-src-head mailing list