diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-08-08 18:58:24 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-08-08 18:58:24 +0000 |
commit | 0444aa5f0950710b76eb3e3212d55bb141fd15d2 (patch) | |
tree | 2910e4591aa948836a06a8647e50698cb8ec88e0 | |
parent | 3f72f168912b4cdec22b5eba4bebddb9846ab8b1 (diff) | |
download | netpbm-mirror-0444aa5f0950710b76eb3e3212d55bb141fd15d2.tar.gz netpbm-mirror-0444aa5f0950710b76eb3e3212d55bb141fd15d2.tar.xz netpbm-mirror-0444aa5f0950710b76eb3e3212d55bb141fd15d2.zip |
Improve message
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2624 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | converter/other/fitstopnm.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/converter/other/fitstopnm.c b/converter/other/fitstopnm.c index 6fe90a49..bdf5c78a 100644 --- a/converter/other/fitstopnm.c +++ b/converter/other/fitstopnm.c @@ -75,7 +75,7 @@ struct CmdlineInfo { 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 @@ -120,7 +120,7 @@ parseCommandLine(int argc, char ** argv, /* Set some defaults the lazy way (using multiple setting of variables) */ - pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); + pm_optParseOptions3(&argc, (char**)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ if (imageSpec) { @@ -145,6 +145,7 @@ parseCommandLine(int argc, char ** argv, pm_error("Too many arguments (%u). The only non-option argument " "is the input file name.", argc-1); } + free(option_def); } @@ -668,7 +669,8 @@ convertPpmRaster(FILE * const ifP, -----------------------------------------------------------------------------*/ unsigned int plane; - pm_message("writing PPM file"); + pm_message("Writing PPM file " + "(Probably not what you want - consider an -image option)"); for (plane = 0; plane < 3; ++plane) { unsigned int row; @@ -732,7 +734,7 @@ convertRaster(FILE * const ifP, int -main(int argc, char * argv[]) { +main(int argc, const char * argv[]) { struct CmdlineInfo cmdline; FILE * ifP; @@ -753,7 +755,7 @@ main(int argc, char * argv[]) { is undefined */ - pnm_init( &argc, argv ); + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); @@ -802,3 +804,6 @@ main(int argc, char * argv[]) { return 0; } + + + |