Skip to contentSkip to conversation

umount.nfs: make umount_usage() static

PATCH In review Chuck Lever 1 participant 1 message Jul 28, 2007

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Chuck Lever

author
#0 lore raw

PATCH 6/23 umount.nfs: make umount_usage() static

No good reason to export umount_usage. Make it static.

Signed-off-by Chuck Lever <[email protected]>

---

 utils/mount/mount.c     |    7 +------
 utils/mount/nfsumount.c |    7 ++++++-
 utils/mount/nfsumount.h |    1 -
 3 files changed, 7 insertions(+), 8 deletions(-)
utils/mount/mount.c +1 -6
index 9503187..d80e5d7 100644
@@ -374,13 +374,8 @@ int main(int argc, char *argv[])
 
 	discover_nfs_mount_data_version();
 
-	if(!strncmp(progname, "umount", strlen("umount"))) {
-		if(argc < 2) {
-			umount_usage();
-			exit(EX_USAGE);
-		}
+	if(!strncmp(progname, "umount", strlen("umount")))
 		exit(nfsumount(argc, argv));
-	}
 
 	if (argv[1] && argv[1][0] == '-') {
 		if(argv[1][1] == 'V')
utils/mount/nfsumount.c +6 -1
index 19e9be3..477f262 100644
@@ -235,7 +235,7 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-void umount_usage()
+static void umount_usage(void)
 {
 	printf(_("usage: %s dir [-fvnrlh]\n"), progname);
 	printf(_("options:\n\t-f\t\tforce unmount\n"));

@@ -252,6 +252,11 @@ int nfsumount(int argc, char *argv[])
 	char *spec;
 	struct mntentchn *mc;
 
+	if (argc < 2) {
+		umount_usage();
+		return EX_USAGE;
+	}
+
 	spec = argv[1];
 
 	argv += 1;
utils/mount/nfsumount.h +0 -1
index e37eaff..191118d 100644
@@ -6,6 +6,5 @@
 
 int nfsumount(int, char **);
 int nfs_call_umount(clnt_addr_t *, dirpath *);
-void umount_usage();
 
 #endif

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs