From 5349a4495d617be1bca96a80ee9b73382729b5c1 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Sat, 23 Jun 2001 15:50:12 +0000
Subject: [PATCH] deal-with-printf-as-macros-20010623

gcc 3.x macroizes printf; deal appropriately
---
 src/bozo/bosserver.c    | 10 +++++++---
 src/ptserver/ptserver.c | 10 +++++++---
 src/vlserver/vlserver.c | 10 +++++++---
 src/volser/volmain.c    | 11 ++++++++---
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 347a930..3fdf45f 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -758,12 +758,16 @@ char **envp;
 
 	    /* hack to support help flag */
 
-	    printf("Usage: bosserver [-noauth] [-log] "
 #ifndef AFS_NT40_ENV
+	    printf("Usage: bosserver [-noauth] [-log] "
 		   "[-syslog[=FACILITY]] "
-#endif
-		   /* "[-enable_peer_stats] [-enable_process_stats] " */
+		   "[-enable_peer_stats] [-enable_process_stats] "
 		   "[-help]\n");
+#else
+	    printf("Usage: bosserver [-noauth] [-log] "
+		   "[-enable_peer_stats] [-enable_process_stats] "
+		   "[-help]\n");
+#endif
 	    fflush(stdout);
 
 	    exit(0);
diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 56371f6..df5dced 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -158,13 +158,17 @@ void main (argc, argv)
 
 		/* hack in help flag support */
 
-	    	printf ("Usage: ptserver [-database <db path>] "
 #ifndef AFS_NT40_ENV
+	    	printf ("Usage: ptserver [-database <db path>] "
 			"[-syslog[=FACILITY]] "
-#endif
 			"[-p <number of processes>] [-rebuild] "
-			/* "[-enable_peer_stats] [-enable_process_stats] " */
+			"[-enable_peer_stats] [-enable_process_stats] "
+			"[-help]\n");
+#else
+	    	printf ("Usage: ptserver [-database <db path>] "
+			"[-p <number of processes>] [-rebuild] "
 			"[-help]\n");
+#endif
 		fflush(stdout);
 
 	    PT_EXIT(1);
diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 395266d..d92645a 100644
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -174,12 +174,16 @@ char	**argv;
 #endif
 	} else {
 	    /* support help flag */
-	    printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
 #ifndef AFS_NT40_ENV
+	    printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
 		   "[-syslog[=FACILITY]] "
-#endif
-		   /*" [-enable_peer_stats] [-enable_process_stats] " */
+		   "[-enable_peer_stats] [-enable_process_stats] "
 		   "[-help]\n");
+#else
+	    printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
+		   "[-enable_peer_stats] [-enable_process_stats] "
+		   "[-help]\n");
+#endif
 	    fflush(stdout);
 	    exit(0);
 	}
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index bdddc9c..b2d8711 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -287,13 +287,18 @@ char **argv; {
 	else {
 	    printf("volserver: unrecognized flag '%s'\n", argv[code]);
 usage:
+#ifndef AFS_NT40_ENV
 	    printf("Usage: volserver [-log] [-p <number of processes>] "
 		   "[-udpsize <size of socket buffer in bytes>] "
-#ifndef AFS_NT40_ENV
 		   "[-syslog[=FACILITY]] "
-#endif
-		   /* "[-enable_peer_stats] [-enable_process_stats] " */
+		   "[-enable_peer_stats] [-enable_process_stats] "
+		   "[-help]\n");
+#else
+	    printf("Usage: volserver [-log] [-p <number of processes>] "
+		   "[-udpsize <size of socket buffer in bytes>] "
+		   "[-enable_peer_stats] [-enable_process_stats] "
 		   "[-help]\n");
+#endif
 	    VS_EXIT(1);
 	}
     }
-- 
1.9.4