deal-with-printf-as-macros-20010623

gcc 3.x macroizes printf; deal appropriately

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 347a9309040daa2d7618eb334ee3212ddd98f942..3fdf45fabb5e40496b087712251935aa0866eb95 100644 (file)
--- 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 56371f6be6a9ce7058b28176e6228aab0d4ce39b..df5dcedd81f068d387ac9226dcbf80f707d325ee 100644 (file)
--- 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 395266dc2d893707d585000942e8f75713c6785b..d92645a47d9df756beca7141a7fa34d14a54205c 100644 (file)
--- 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 bdddc9cf8d0c5ea3b874e8a827d0f0b671066fd7..b2d87115a9c18a250c3e7ae6d5488e2a8a9f578e 100644 (file)
--- 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);
        }
     }