diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-19 21:28:49 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-19 21:28:49 +0000 |
commit | ca4c44251842921c00eb9b3c4d38996ef6e9a5d2 (patch) | |
tree | fae693571e515789a23a95f992a0b630eced9b12 /converter | |
parent | 2a4b7ed2c9a770fa70628b0f5eca1b1e96251e1b (diff) | |
download | netpbm-mirror-ca4c44251842921c00eb9b3c4d38996ef6e9a5d2.tar.gz netpbm-mirror-ca4c44251842921c00eb9b3c4d38996ef6e9a5d2.tar.xz netpbm-mirror-ca4c44251842921c00eb9b3c4d38996ef6e9a5d2.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1290 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r-- | converter/other/pnmtopng.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index f7be6aa0..0a97e7bf 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -118,7 +118,7 @@ struct cmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. */ - const char * inputFilename; /* '-' if stdin */ + const char * inputFileName; /* '-' if stdin */ const char * alpha; unsigned int verbose; unsigned int downscale; @@ -275,7 +275,7 @@ parseModtimeOpt(const char * const modtimeOpt, static void -parseCommandLine(int argc, char ** argv, +parseCommandLine(int argc, const char ** argv, struct cmdlineInfo * const cmdlineP) { /*---------------------------------------------------------------------------- parse program command line described in Unix standard form by argc @@ -383,7 +383,7 @@ parseCommandLine(int argc, char ** argv, opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ - optParseOptions3(&argc, argv, opt, sizeof(opt), 0); + optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ @@ -483,9 +483,9 @@ parseCommandLine(int argc, char ** argv, if (argc-1 < 1) - cmdlineP->inputFilename = "-"; + cmdlineP->inputFileName = "-"; else if (argc-1 == 1) - cmdlineP->inputFilename = argv[1]; + cmdlineP->inputFileName = argv[1]; else pm_error("Program takes at most one argument: input file name"); } @@ -2882,7 +2882,7 @@ displayVersion() { int -main(int argc, char *argv[]) { +main(int argc, const char * argv[]) { struct cmdlineInfo cmdline; FILE * ifP; @@ -2892,7 +2892,7 @@ main(int argc, char *argv[]) { int errorlevel; - pnm_init(&argc, argv); + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); @@ -2902,7 +2902,7 @@ main(int argc, char *argv[]) { } verbose = cmdline.verbose; - ifP = pm_openr_seekable(cmdline.inputFilename); + ifP = pm_openr_seekable(cmdline.inputFileName); if (cmdline.alpha) afP = pm_openr(cmdline.alpha); |