Changeset 13583

Timestamp:

May 31, 2007, 6:06:24 PM (19 years ago)

Author:

jhoblitt

Message:

merge pxUsage() & pxUsageMode() -> pxUsage()

Location:

trunk/ippTools/src

Files:

• pxconfig.c (modified) (7 diffs)
• pxtools.h (modified) (1 diff)

trunk/ippTools/src/pxconfig.c

@@ -23 +23 @@
 
 #include <string.h>
+#include <stdio.h>
 
 #include <pslib.h>
@@ -57 +58 @@
 }
 
-void pxUsage(FILE *stream, int argc, char **argv, psMetadata *modes) 
-{
-    fprintf(stream, "Usage: %s <mode> [<options>]\n\n", argv[0]);
-    fprintf(stream, "<mode>:\n");
-
-    psArgumentHelpSimple(stream, modes);
-}
-
-
-void pxUsageMode(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet) 
-{
-    fprintf(stream, "Usage: %s <mode> [<options>]\n\n", argv[0]);
+void pxUsage(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet) 
+{
+    fprintf(stream, "Usage: %s %s [<options>]\n\n", argv[0], modeName);
     fprintf(stream, "%s:\n", modeName);
 
     psArgumentHelpSimple(stream, argSet);
 }
-
 
 bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets)
@@ -88 +79 @@
                 psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed");
                 fprintf(stream, "only one mode selection is allowed\n");
-                pxUsage(stream, argc, argv, modes);
+                pxUsage(stream, argc, argv, "<mode>", modes);
                 psFree(iter);
                 return NULL;
@@ -117 +108 @@
         psError(PS_ERR_UNKNOWN, true, "mode argument is required");
         fprintf(stderr, "mode argument is required\n");
-        pxUsage(stream, argc, argv, modes);
+        pxUsage(stream, argc, argv, "<mode>", modes);
         return NULL;
     }
@@ -125 +116 @@
         psError(PS_ERR_UNKNOWN, true, "error parsing arguments");
         fprintf(stderr, "error parsing arguments\n");
-        pxUsageMode(stream, argc, argv, config->modeName, config->args);
+        pxUsage(stream, argc, argv, config->modeName, config->args);
         return NULL;
     }
@@ -137 +128 @@
         }
         fprintf(stderr, "\n");
-        pxUsageMode(stream, argc, argv, config->modeName, config->args);
+        pxUsage(stream, argc, argv, config->modeName, config->args);
         return NULL;
     }
@@ -216 +207 @@
                 psError(PS_ERR_UNKNOWN, false, "argument %s is required", item->name);
                 fprintf(stream, "argument %s is required\n", item->name);
-                pxUsageMode(stream, argc, argv, config->modeName, config->args);
+                pxUsage(stream, argc, argv, config->modeName, config->args);
                 psFree(iter);
                 return NULL;

trunk/ippTools/src/pxtools.h

@@ -54 +54 @@
 psExit pxerrorGetExitStatus ();
 
-void pxUsage(FILE *stream, int argc, char **argv, psMetadata *modes);
-void pxUsageMode(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet);
+void pxUsage(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet);
 bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets);