From c84db6d5899ca01a32e4506eb730151c3e03cce3 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Thu, 7 Mar 2024 19:21:18 +0000 Subject: cleanup git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4858 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- analyzer/pamfile.c | 4 ++-- analyzer/pamfind.c | 4 ++-- analyzer/pamgetcolor.c | 4 ++-- analyzer/pamslice.c | 2 +- analyzer/pamsumm.c | 4 ++-- analyzer/pamtable.c | 4 ++-- analyzer/pamtilt.c | 2 +- analyzer/pgmhist.c | 2 +- analyzer/pgmtexture.c | 4 +--- analyzer/pnmhistmap.c | 4 ++-- analyzer/pnmpsnr.c | 4 ++-- analyzer/ppmhist.c | 2 +- 12 files changed, 19 insertions(+), 21 deletions(-) (limited to 'analyzer') diff --git a/analyzer/pamfile.c b/analyzer/pamfile.c index 1cf764e2..80674710 100644 --- a/analyzer/pamfile.c +++ b/analyzer/pamfile.c @@ -40,7 +40,7 @@ parseCommandLine(int argc, const char ** argv, was passed to as as the argv array. -----------------------------------------------------------------------------*/ optEntry * option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. + /* Instructions to pm_optParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -60,7 +60,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 */ cmdlineP->inputFilespec = (const char **)&argv[1]; diff --git a/analyzer/pamfind.c b/analyzer/pamfind.c index 15ca9e85..fb98aea3 100644 --- a/analyzer/pamfind.c +++ b/analyzer/pamfind.c @@ -23,7 +23,7 @@ parsedCommandLine(int argc, const char ** const argv) { optEntry * option_def; - /* Instructions to OptParseOptions3 on how to parse our options. + /* Instructions to OptParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -46,7 +46,7 @@ parsedCommandLine(int argc, 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); if (targetSpec + colorSpec > 1) pm_error("You cannot specify both -target and -color"); diff --git a/analyzer/pamgetcolor.c b/analyzer/pamgetcolor.c index 2bd3050c..e7e9160d 100644 --- a/analyzer/pamgetcolor.c +++ b/analyzer/pamgetcolor.c @@ -250,7 +250,7 @@ parsedCommandLine(int argc, const char ** const argv) { optEntry * option_def; - /* Instructions to OptParseOptions3 on how to parse our options. + /* Instructions to OptParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -273,7 +273,7 @@ parsedCommandLine(int argc, 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); if (!infileSpec) cmdLine.infile = "-"; diff --git a/analyzer/pamslice.c b/analyzer/pamslice.c index 5bdbea10..9d236441 100644 --- a/analyzer/pamslice.c +++ b/analyzer/pamslice.c @@ -50,7 +50,7 @@ parseCommandLine(int argc, char ** const argv, was passed to us as the argv array. -----------------------------------------------------------------------------*/ optEntry *option_def = malloc(100*sizeof(optEntry)); - /* Instructions to OptParseOptions2 on how to parse our options. + /* Instructions to OptParseOptions3 on how to parse our options. */ optStruct3 opt; diff --git a/analyzer/pamsumm.c b/analyzer/pamsumm.c index 03ff6749..e6c5aca8 100644 --- a/analyzer/pamsumm.c +++ b/analyzer/pamsumm.c @@ -32,7 +32,7 @@ parseCommandLine(int argc, const char ** const argv, struct CmdlineInfo * const cmdlineP) { optEntry * option_def; - /* Instructions to OptParseOptions3 on how to parse our options. + /* Instructions to OptParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -55,7 +55,7 @@ parseCommandLine(int argc, const char ** const 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 (sumSpec + minSpec + maxSpec + meanSpec > 1) diff --git a/analyzer/pamtable.c b/analyzer/pamtable.c index acd027a6..333eff69 100644 --- a/analyzer/pamtable.c +++ b/analyzer/pamtable.c @@ -33,7 +33,7 @@ parseCommandLine(int argc, const char ** const argv, struct CmdlineInfo * const cmdlineP) { optEntry * option_def; - /* Instructions to OptParseOptions3 on how to parse our options. + /* Instructions to OptParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -53,7 +53,7 @@ parseCommandLine(int argc, const char ** const 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 (tuple && cmdlineP->hex) diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c index 2898d30f..031c4206 100644 --- a/analyzer/pamtilt.c +++ b/analyzer/pamtilt.c @@ -76,7 +76,7 @@ parseCommandLine(int argc, const char ** const argv, opt.opt_table = option_def; opt.short_allowed = FALSE; /* no short options used */ opt.allowNegNum = FALSE; /* don't allow negative values */ - pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); + pm_optParseOptions4(&argc, argv, opt, sizeof(opt), 0); if (cmdlineP->hstep < 1) pm_error("-hstep must be at least 1 column."); diff --git a/analyzer/pgmhist.c b/analyzer/pgmhist.c index a85f0649..3b0b9b95 100644 --- a/analyzer/pgmhist.c +++ b/analyzer/pgmhist.c @@ -64,7 +64,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 (cmdlineP->median + cmdlineP->quartile + cmdlineP->decile > 1) diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c index 8a1678e2..938f9ef8 100644 --- a/analyzer/pgmtexture.c +++ b/analyzer/pgmtexture.c @@ -31,8 +31,6 @@ parseCommandLine(int argc, const char ** const argv, was passed to us as the argv array. -----------------------------------------------------------------------------*/ optEntry * option_def; - /* Instructions to OptParseOptions3 on how to parse our options. - */ optStruct3 opt; unsigned int option_def_index; @@ -47,7 +45,7 @@ parseCommandLine(int argc, const char ** const argv, opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = TRUE; /* We may have 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 (!dSpec) diff --git a/analyzer/pnmhistmap.c b/analyzer/pnmhistmap.c index e51bbb24..3c943db9 100644 --- a/analyzer/pnmhistmap.c +++ b/analyzer/pnmhistmap.c @@ -59,7 +59,7 @@ parseCommandLine(int argc, const char ** argv, was passed to us as the argv array. -----------------------------------------------------------------------------*/ optEntry *option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. + /* Instructions to pm_optParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -92,7 +92,7 @@ parseCommandLine(int argc, const char ** argv, opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We may have 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 (!lvalSpec) diff --git a/analyzer/pnmpsnr.c b/analyzer/pnmpsnr.c index 6543c542..031b714e 100644 --- a/analyzer/pnmpsnr.c +++ b/analyzer/pnmpsnr.c @@ -95,7 +95,7 @@ parseCommandLine(int argc, const char ** argv, was passed to as as the argv array. -----------------------------------------------------------------------------*/ optEntry * option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. + /* Instructions to pm_optParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -123,7 +123,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 (argc-1 < 2) diff --git a/analyzer/ppmhist.c b/analyzer/ppmhist.c index 62345fa1..4bafe73c 100644 --- a/analyzer/ppmhist.c +++ b/analyzer/ppmhist.c @@ -69,7 +69,7 @@ parseCommandLine(int argc, const char ** argv, /* Set defaults */ sort_type = "frequency"; - 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. */ free(option_def); -- cgit 1.4.1