From d3d3d2c51ab12a1be5f19745dc0ebb7d306fcc3b Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 10:57:47 +0000
Subject: [PATCH 1/1] vlserver: Rationalise usage message

Rather than having 2 copies of the usage message, just have one
with #ifdef switches to disable options that are not available in
that build.

Change-Id: I5b2135fba3d42fdbb879d5e8cb61933f4929d598
Reviewed-on: http://gerrit.openafs.org/4305
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/vlserver/vlserver.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 5f22a6e..ffeb498 100644
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -222,20 +222,14 @@ main(int argc, char **argv)
 #endif
 	} else {
 	    /* support help flag */
-#ifndef AFS_NT40_ENV
-	    printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
-		   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals] "
-		   "[-auditlog <log path>] [-jumbo] [-d <debug level>] "
-		   "[-syslog[=FACILITY]] "
-		   "[-enable_peer_stats] [-enable_process_stats] "
-		   "[-help]\n");
-#else
 	    printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
 		   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals] "
-		   "[-auditlog <log path>] [-jumbo] [-d <debug level>] "
-		   "[-enable_peer_stats] [-enable_process_stats] "
-		   "[-help]\n");
+		   "[-auditlog <log path>] [-jumbo] [-d <debug level>] ");
+#ifndef AFS_NT40_ENV
+	    printf("[-syslog[=FACILITY]] ");
 #endif
+	    printf("[-enable_peer_stats] [-enable_process_stats] "
+		   "[-help]\n");
 	    fflush(stdout);
 	    exit(0);
 	}
-- 
1.9.4