Make extattrctl WARNS?=2-safe:

o remove extraneous extern's
o prototype functions
o combine multiple return (0)'s into a single return (0) at the
  end of main()

Approved by:	rwatson
Obtained from:	TrustedBSD Project

2 files changed, 7 insertions, 8 deletions

diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 496a8aa8c7c16..52142afa573b6 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	extattrctl
+WARNS?=	2
 MAN=	extattrctl.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index f7704219b9446..0a422eba5d71c 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -48,11 +48,12 @@
 #include <string.h>
 #include <unistd.h>
 
-extern char	*optarg;
-extern int	optind;
+int initattr(int argc, char *argv[]);
+long num_inodes_by_path(char *path);
+void usage(void);
 
 void
-usage(void)
+usage()
 {
 
 	fprintf(stderr,
@@ -176,7 +177,6 @@ main(int argc, char *argv[])
 			perror("extattrctl start");
 			return (-1);
 		}
-		return (0);
 	} else if (!strcmp(argv[1], "stop")) {
 		if (argc != 3)
 			usage();
@@ -186,7 +186,6 @@ main(int argc, char *argv[])
 			perror("extattrctl stop");
 			return (-1);
 		}
-		return (0);
 	} else if (!strcmp(argv[1], "enable")) {
 		if (argc != 6)
 			usage();
@@ -201,7 +200,6 @@ main(int argc, char *argv[])
 			perror("extattrctl enable");
 			return (-1);
 		}
-		return (0);
 	} else if (!strcmp(argv[1], "disable")) {
 		if (argc != 5)
 			usage();
@@ -216,14 +214,14 @@ main(int argc, char *argv[])
 			perror("extattrctl disable");
 			return (-1);
 		}
-		return (0);
 	} else if (!strcmp(argv[1], "initattr")) {
 		argc -= 2;
 		argv += 2;
 		error = initattr(argc, argv);
 		if (error)
 			return (-1);
-		return (0);
 	} else
 		usage();
+
+	return (0);
 }