--- src/usr.bin/basename/basename.c	2005/09/22 23:44:55	1.6
+++ src/usr.bin/basename/basename.c	2005/09/22 23:47:14	1.7
@@ -62,12 +62,13 @@ main(int argc, char **argv)
 	suffix = NULL;
 	suffixlen = 0;
 
-	while ((ch = getopt(argc, argv, "")) != -1)
+	while ((ch = getopt(argc, argv, "")) != -1) {
 		switch(ch) {
 		case '?':
 		default:
 			usage();
 		}
+	}
 	argc -= optind;
 	argv += optind;
 
@@ -85,8 +86,8 @@ main(int argc, char **argv)
 		suffixlen = strlen(argv[1]);
 	}
 	stripsuffix(p, suffix, suffixlen);
-	(void)printf("%s\n", p);
-	exit(0);
+	printf("%s\n", p);
+	return (0);
 }
 
 void
@@ -117,6 +118,6 @@ void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: basename string [suffix]\n");
+	fprintf(stderr, "usage: basename string [suffix]\n");
 	exit(1);
 }