IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 31, 2007, 6:06:24 PM (19 years ago)
Author:
jhoblitt
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/pxconfig.c

    r13580 r13583  
    2323
    2424#include <string.h>
     25#include <stdio.h>
    2526
    2627#include <pslib.h>
    … …  
    5758}
    5859
    59 void pxUsage(FILE *stream, int argc, char **argv, psMetadata *modes)
    60 {
    61     fprintf(stream, "Usage: %s <mode> [<options>]\n\n", argv[0]);
    62     fprintf(stream, "<mode>:\n");
    63 
    64     psArgumentHelpSimple(stream, modes);
    65 }
    66 
    67 
    68 void pxUsageMode(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet)
    69 {
    70     fprintf(stream, "Usage: %s <mode> [<options>]\n\n", argv[0]);
     60void pxUsage(FILE *stream, int argc, char **argv, const char *modeName, psMetadata *argSet)
     61{
     62    fprintf(stream, "Usage: %s %s [<options>]\n\n", argv[0], modeName);
    7163    fprintf(stream, "%s:\n", modeName);
    7264
    7365    psArgumentHelpSimple(stream, argSet);
    7466}
    75 
    7667
    7768bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets)
    … …  
    8879                psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed");
    8980                fprintf(stream, "only one mode selection is allowed\n");
    90                 pxUsage(stream, argc, argv, modes);
     81                pxUsage(stream, argc, argv, "<mode>", modes);
    9182                psFree(iter);
    9283                return NULL;
    … …  
    117108        psError(PS_ERR_UNKNOWN, true, "mode argument is required");
    118109        fprintf(stderr, "mode argument is required\n");
    119         pxUsage(stream, argc, argv, modes);
     110        pxUsage(stream, argc, argv, "<mode>", modes);
    120111        return NULL;
    121112    }
    … …  
    125116        psError(PS_ERR_UNKNOWN, true, "error parsing arguments");
    126117        fprintf(stderr, "error parsing arguments\n");
    127         pxUsageMode(stream, argc, argv, config->modeName, config->args);
     118        pxUsage(stream, argc, argv, config->modeName, config->args);
    128119        return NULL;
    129120    }
    … …  
    137128        }
    138129        fprintf(stderr, "\n");
    139         pxUsageMode(stream, argc, argv, config->modeName, config->args);
     130        pxUsage(stream, argc, argv, config->modeName, config->args);
    140131        return NULL;
    141132    }
    … …  
    216207                psError(PS_ERR_UNKNOWN, false, "argument %s is required", item->name);
    217208                fprintf(stream, "argument %s is required\n", item->name);
    218                 pxUsageMode(stream, argc, argv, config->modeName, config->args);
     209                pxUsage(stream, argc, argv, config->modeName, config->args);
    219210                psFree(iter);
    220211                return NULL;
Note: See TracChangeset for help on using the changeset viewer.