diff options
Diffstat (limited to 'converter/ppm/winicontoppm.c')
| -rw-r--r-- | converter/ppm/winicontoppm.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/converter/ppm/winicontoppm.c b/converter/ppm/winicontoppm.c index 98fe0934..014eab40 100644 --- a/converter/ppm/winicontoppm.c +++ b/converter/ppm/winicontoppm.c @@ -639,11 +639,11 @@ writeXors(FILE * const multiOutF, } else { if (outputFileBase) { if (multiple) { - asprintfN(&outputFile, "%s%s_%d.ppm", - outputFileBase,(xor ? "_xor" : ""), entryNum); + pm_asprintf(&outputFile, "%s%s_%d.ppm", + outputFileBase,(xor ? "_xor" : ""), entryNum); } else { - asprintfN(&outputFile, "%s%s.ppm", - outputFileBase,(xor ? "_xor" : "")); + pm_asprintf(&outputFile, "%s%s.ppm", + outputFileBase,(xor ? "_xor" : "")); } } else outputFile = strdup("-"); @@ -690,7 +690,7 @@ writeXors(FILE * const multiOutF, (pixval) maxval, forcetext); ppm_freearray(ppm_array,entry->height); - strfree(outputFile); + pm_strfree(outputFile); if (!multiOutF) pm_close(outF); @@ -727,11 +727,12 @@ writeAnds(FILE * const multiOutF, assert(outputFileBase); if (multiple) - asprintfN(&outputFile, "%s_and_%d.pbm", outputFileBase, entryNum); + pm_asprintf(&outputFile, "%s_and_%d.pbm", + outputFileBase, entryNum); else - asprintfN(&outputFile, "%s_and.pbm", outputFileBase); + pm_asprintf(&outputFile, "%s_and.pbm", outputFileBase); outF = pm_openw(outputFile); - strfree(outputFile); + pm_strfree(outputFile); } pbm_array = pbm_allocarray(entry->width, entry->height); for (row=0; row < entry->height; row++) { @@ -760,8 +761,8 @@ openMultiXor(char outputFileBase[], const char *outputFile; if (outputFileBase) { - asprintfN(&outputFile, "%s%s.ppm", - outputFileBase, (writeands ? "_xor" : "")); + pm_asprintf(&outputFile, "%s%s.ppm", + outputFileBase, (writeands ? "_xor" : "")); } else outputFile = strdup("-"); @@ -770,7 +771,7 @@ openMultiXor(char outputFileBase[], */ *multiOutFP = pm_openw(outputFile); - strfree(outputFile); + pm_strfree(outputFile); } @@ -782,11 +783,11 @@ openMultiAnd(char outputFileBase[], FILE ** const multiAndOutFP) { assert(outputFileBase); - asprintfN(&outputFile, "%s_and.pbm", outputFileBase); + pm_asprintf(&outputFile, "%s_and.pbm", outputFileBase); *multiAndOutFP = pm_openw(outputFile); - strfree(outputFile); + pm_strfree(outputFile); } static void free_iconentry(IC_Entry entry) { |