diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-05-20 02:29:22 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-05-20 02:29:22 +0000 |
commit | dc8646b9e19441a6b6fc2c6b0b0675291068eee3 (patch) | |
tree | fcb6f4528796fba4ca1aa21387c413b595dcdce8 /converter/other/pnmtoxwd.c | |
parent | 1ae17bee71ab8534bd55da0d153eecb0fede19c0 (diff) | |
download | netpbm-mirror-dc8646b9e19441a6b6fc2c6b0b0675291068eee3.tar.gz netpbm-mirror-dc8646b9e19441a6b6fc2c6b0b0675291068eee3.tar.xz netpbm-mirror-dc8646b9e19441a6b6fc2c6b0b0675291068eee3.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2507 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/pnmtoxwd.c')
-rw-r--r-- | converter/other/pnmtoxwd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/converter/other/pnmtoxwd.c b/converter/other/pnmtoxwd.c index 8a001390..0c559bef 100644 --- a/converter/other/pnmtoxwd.c +++ b/converter/other/pnmtoxwd.c @@ -20,11 +20,11 @@ #include "x11wd.h" -struct cmdlineInfo { +struct CmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. */ - const char *inputFilespec; /* Filespecs of input file */ + const char *inputFilename; /* Filename of input file */ unsigned int pseudodepth; unsigned int directcolor; }; @@ -34,7 +34,7 @@ struct cmdlineInfo { static void parseCommandLine(int argc, char ** argv, - struct cmdlineInfo * const cmdlineP) { + 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. @@ -78,12 +78,12 @@ parseCommandLine(int argc, } if (argc-1 == 0) - cmdlineP->inputFilespec = "-"; + cmdlineP->inputFilename = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " "specified %d", argc-1); else - cmdlineP->inputFilespec = argv[1]; + cmdlineP->inputFilename = argv[1]; } @@ -410,7 +410,7 @@ writeRaster(FILE * const ofP, int main(int argc, char * argv[]) { - struct cmdlineInfo cmdline; + struct CmdlineInfo cmdline; FILE* ifP; xel ** xels; int rows, cols, format, colors; @@ -426,7 +426,7 @@ main(int argc, char * argv[]) { parseCommandLine(argc, argv, &cmdline); - ifP = pm_openr(cmdline.inputFilespec); + ifP = pm_openr(cmdline.inputFilename); xels = pnm_readpnm(ifP, &cols, &rows, &maxval, &format); xmaxval = (1 << cmdline.pseudodepth) - 1; @@ -473,13 +473,13 @@ main(int argc, char * argv[]) { } } - if (streq(cmdline.inputFilespec, "-")) + if (streq(cmdline.inputFilename, "-")) dumpname = "stdin"; else { - if (strlen(cmdline.inputFilespec) > XWDVAL_MAX - sizeof(h11) - 1) + if (strlen(cmdline.inputFileSpec) > XWDVAL_MAX - sizeof(h11) - 1) pm_error("Input file name is ridiculously long."); else - dumpname = cmdline.inputFilespec; + dumpname = cmdline.inputFileSpec; } setupX11Header(&h11, dumpname, cols, rows, format, |