diff options
Diffstat (limited to 'editor/pamdice.c')
| -rw-r--r-- | editor/pamdice.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/editor/pamdice.c b/editor/pamdice.c index f72420ab..2c53a110 100644 --- a/editor/pamdice.c +++ b/editor/pamdice.c @@ -53,7 +53,7 @@ parseCommandLine(int argc, char ** argv, was passed to us as the argv array. We also trash *argv. -----------------------------------------------------------------------------*/ optEntry *option_def; - /* Instructions to optParseOptions3 on how to parse our options. + /* Instructions to pm_optParseOptions3 on how to parse our options. */ optStruct3 opt; @@ -80,7 +80,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 ); + pm_optParseOptions3( &argc, argv, opt, sizeof(opt), 0 ); /* Uses and sets argc, argv, and some of *cmdline_p and others. */ if (cmdlineP->sliceVertically) { @@ -223,9 +223,9 @@ computeOutputFilenameFormat(int const format, default: filenameSuffix = ""; break; } - asprintfN(filenameFormatP, "%s_%%0%uu_%%0%uu.%s", - outstem, ndigits(nHorizSlice), ndigits(nVertSlice), - filenameSuffix); + pm_asprintf(filenameFormatP, "%s_%%0%uu_%%0%uu.%s", + outstem, ndigits(nHorizSlice), ndigits(nVertSlice), + filenameSuffix); if (*filenameFormatP == NULL) pm_error("Unable to allocate memory for filename format string"); @@ -258,7 +258,7 @@ openOutStreams(struct pam const inpam, for (vertSlice = 0; vertSlice < nVertSlice; ++vertSlice) { const char * filename; - asprintfN(&filename, filenameFormat, horizSlice, vertSlice); + pm_asprintf(&filename, filenameFormat, horizSlice, vertSlice); if (filename == NULL) pm_error("Unable to allocate memory for output filename"); @@ -273,10 +273,10 @@ openOutStreams(struct pam const inpam, pnm_writepaminit(&outpam[vertSlice]); - strfree(filename); + pm_strfree(filename); } } - strfree(filenameFormat); + pm_strfree(filenameFormat); } |