diff options
Diffstat (limited to 'converter/other/yuy2topam.c')
| -rw-r--r-- | converter/other/yuy2topam.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/converter/other/yuy2topam.c b/converter/other/yuy2topam.c index 40ab98b3..8416d393 100644 --- a/converter/other/yuy2topam.c +++ b/converter/other/yuy2topam.c @@ -31,12 +31,12 @@ struct CmdlineInfo { -static void -parseCommandLine(int argc, const char ** argv, +static void +parseCommandLine(int argc, const char ** argv, struct CmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -44,8 +44,7 @@ parseCommandLine(int argc, const char ** argv, Note that the strings we return are stored in the storage that was passed to us as the argv array. We also trash *argv. --------------------------------------------------------------------------*/ - optEntry * option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. */ + optEntry * option_def; /* Used by OPTENT3 */ optStruct3 opt; unsigned int widthSpec, heightSpec; @@ -63,7 +62,7 @@ parseCommandLine(int argc, const char ** argv, opt.short_allowed = false; /* We have no short (old-fashioned) options */ opt.allowNegNum = false; /* We have no parms that are negative numbers */ - pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); + pm_optParseOptions4(&argc, argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ if (!widthSpec) @@ -84,7 +83,7 @@ parseCommandLine(int argc, const char ** argv, cmdlineP->inputFileName = "-"; else { cmdlineP->inputFileName = argv[1]; - + if (argc-1 > 1) pm_error("Too many arguments (%u). The only non-option argument " "is the input file name.", argc-1); @@ -264,3 +263,6 @@ main(int argc, const char *argv[]) { return 0; } + + + |