diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/pamlookup.c | 4 | ||||
-rw-r--r-- | other/pamsplit.c | 8 | ||||
-rw-r--r-- | other/pamx/pamx.c | 2 | ||||
-rw-r--r-- | other/pamx/window.c | 6 | ||||
-rw-r--r-- | other/ppmdcfont.c | 20 |
5 files changed, 20 insertions, 20 deletions
diff --git a/other/pamlookup.c b/other/pamlookup.c index 41da4f2d..d5f046a5 100644 --- a/other/pamlookup.c +++ b/other/pamlookup.c @@ -94,7 +94,7 @@ fitLookup(tuple ** const inputLookup, fitLookuppamP->width = cols; fitLookuppamP->height = rows; - asprintfN(&pamscaleCommand, "pamscale -width=%u -height=%u", cols, rows); + pm_asprintf(&pamscaleCommand, "pamscale -width=%u -height=%u", cols, rows); inPamtuples.pamP = (struct pam *) &inputLookuppam; inPamtuples.tuplesP = (tuple ***) &inputLookup; @@ -105,7 +105,7 @@ fitLookup(tuple ** const inputLookup, &pm_accept_to_pamtuples, &outPamtuples, pamscaleCommand); - strfree(pamscaleCommand); + pm_strfree(pamscaleCommand); } diff --git a/other/pamsplit.c b/other/pamsplit.c index eb1176e1..2c64d1a0 100644 --- a/other/pamsplit.c +++ b/other/pamsplit.c @@ -138,11 +138,11 @@ computeOutputName(char const outputFilePattern[], afterSub = strstr(outputFilePattern, "%d") + 2; /* Make filenameFormat something like "%s%04u%s" */ - asprintfN(&filenameFormat, "%%s%%0%ud%%s", padCount); + pm_asprintf(&filenameFormat, "%%s%%0%ud%%s", padCount); - asprintfN(outputNameP, filenameFormat, beforeSub, imageSeq, afterSub); + pm_asprintf(outputNameP, filenameFormat, beforeSub, imageSeq, afterSub); - strfree(filenameFormat); + pm_strfree(filenameFormat); free(beforeSub); } @@ -179,7 +179,7 @@ main(int argc, char *argv[]) { extractOneImage(ifP, ofP); pm_close(ofP); - strfree(outputFileName); + pm_strfree(outputFileName); pnm_nextimage(ifP, &eof); } diff --git a/other/pamx/pamx.c b/other/pamx/pamx.c index 384cfd9d..dbb8b62a 100644 --- a/other/pamx/pamx.c +++ b/other/pamx/pamx.c @@ -360,7 +360,7 @@ main(int argc, destroyViewer(viewerP); if (title) - strfree(title); + pm_strfree(title); XCloseDisplay(dispP); diff --git a/other/pamx/window.c b/other/pamx/window.c index 1a91416a..29f85d92 100644 --- a/other/pamx/window.c +++ b/other/pamx/window.c @@ -112,11 +112,11 @@ getInitialViewerGeometry(const char * const geometryString, *userChoseP = TRUE; } else if (geometryString) { const char * defGeom; - asprintfN(&defGeom, "%ux%u+0+0", defaultWidth, defaultHeight); + pm_asprintf(&defGeom, "%ux%u+0+0", defaultWidth, defaultHeight); XGeometry(dispP, scrn, geometryString, defGeom, 0, 1, 1, 0, 0, (int *)xposP, (int *)yposP, (int *)widthP, (int *)heightP); - strfree(defGeom); + pm_strfree(defGeom); *userChoseP = TRUE; } else { *widthP = defaultWidth; @@ -1175,7 +1175,7 @@ displayInViewer(viewer * const viewerP, { const char * const name = iconName(title); XSetIconName(viewerP->dispP, viewerP->viewportWin, name); - strfree(name); + pm_strfree(name); } setNormalSizeHints(viewerP, imageP); diff --git a/other/ppmdcfont.c b/other/ppmdcfont.c index 701277a9..130b6383 100644 --- a/other/ppmdcfont.c +++ b/other/ppmdcfont.c @@ -73,14 +73,14 @@ generateCommandTables(const struct ppmd_font * const fontP, if (fontP->glyphTable[relativeCodePoint].header.commandCount > 0) { const char * commandTableVariableName; - asprintfN(&commandTableVariableName, "%s_cmd_%u", - glyphTableVariableName, - fontP->header.firstCodePoint + relativeCodePoint); + pm_asprintf(&commandTableVariableName, "%s_cmd_%u", + glyphTableVariableName, + fontP->header.firstCodePoint + relativeCodePoint); generateCommandTable(fontP->glyphTable[relativeCodePoint], commandTableVariableName); - strfree(commandTableVariableName); + pm_strfree(commandTableVariableName); fprintf(stdout, "};\n"); fprintf(stdout, "\n"); @@ -130,14 +130,14 @@ generateGlyphTable(const struct ppmd_font * const fontP, const char * commandTableVariableName; - asprintfN(&commandTableVariableName, "%s_cmd_%u", - variableName, - fontP->header.firstCodePoint + relativeCodePoint); + pm_asprintf(&commandTableVariableName, "%s_cmd_%u", + variableName, + fontP->header.firstCodePoint + relativeCodePoint); generateGlyph(fontP->glyphTable[relativeCodePoint], commandTableVariableName); - strfree(commandTableVariableName); + pm_strfree(commandTableVariableName); if (relativeCodePoint < fontP->header.characterCount - 1) fprintf(stdout, " ,\n"); @@ -184,7 +184,7 @@ main(int argc, char **argv) { fprintf(stdout, "#include \"ppmdfont.h\"\n\n"); - asprintfN(&glyphTableVariableName, "%s_glyphTable", fontVariableName); + pm_asprintf(&glyphTableVariableName, "%s_glyphTable", fontVariableName); generateGlyphTable(fontP, glyphTableVariableName); @@ -192,7 +192,7 @@ main(int argc, char **argv) { generateFont(fontP, fontVariableName, glyphTableVariableName); - strfree(glyphTableVariableName); + pm_strfree(glyphTableVariableName); ppmd_free_font(fontP); |