diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-29 21:45:56 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-29 21:45:56 +0000 |
commit | 28ed9cda2a47c17130ee5b97588695ed3acb4e45 (patch) | |
tree | 8de89d205b94221a7941177f365f0e05c0fad039 /lib/libppmcolor.c | |
parent | c1b82fa06e7e88a68c877c501fc0422888920415 (diff) | |
download | netpbm-mirror-28ed9cda2a47c17130ee5b97588695ed3acb4e45.tar.gz netpbm-mirror-28ed9cda2a47c17130ee5b97588695ed3acb4e45.tar.xz netpbm-mirror-28ed9cda2a47c17130ee5b97588695ed3acb4e45.zip |
Rename nstring.h functions with pm_ prefix
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1320 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib/libppmcolor.c')
-rw-r--r-- | lib/libppmcolor.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c index 7e324185..36eb7a3f 100644 --- a/lib/libppmcolor.c +++ b/lib/libppmcolor.c @@ -264,7 +264,7 @@ parseOldX11(char const colorname[], computeHexTable(hexit); - if (!strishex(&colorname[1])) + if (!pm_strishex(&colorname[1])) pm_error("Non-hexadecimal characters in #-type color specification"); switch (strlen(colorname) - 1 /* (Number of hex digits) */) { @@ -460,8 +460,8 @@ processColorfileEntry(struct colorfile_entry const ce, const char ** const errorP) { if (*colornameIndexP >= MAXCOLORNAMES) - asprintfN(errorP, "Too many colors in colorname dictionary. " - "Max allowed is %u", MAXCOLORNAMES); + pm_asprintf(errorP, "Too many colors in colorname dictionary. " + "Max allowed is %u", MAXCOLORNAMES); else { pixel color; @@ -479,7 +479,7 @@ processColorfileEntry(struct colorfile_entry const ce, colornames[*colornameIndexP] = strdup(ce.colorname); colors[*colornameIndexP] = color; if (colornames[*colornameIndexP] == NULL) - asprintfN(errorP, "Unable to allocate space for color name"); + pm_asprintf(errorP, "Unable to allocate space for color name"); else { *errorP = NULL; ++(*colornameIndexP); @@ -500,7 +500,7 @@ openColornameFile(const char * const fileName, jmp_buf * origJmpbufP; if (setjmp(jmpbuf) != 0) { - asprintfN(errorP, "Failed to open color name file"); + pm_asprintf(errorP, "Failed to open color name file"); pm_setjmpbuf(origJmpbufP); pm_longjmp(); } else { @@ -554,7 +554,7 @@ readOpenColorFile(FILE * const colorFileP, unsigned int colorIndex; for (colorIndex = 0; colorIndex < nColorsDone; ++colorIndex) - strfree(colornames[colorIndex]); + pm_strfree(colornames[colorIndex]); } } @@ -624,21 +624,21 @@ readcolordict(const char * const fileName, MALLOCARRAY(colornames, MAXCOLORNAMES); if (colornames == NULL) - asprintfN(errorP, "Unable to allocate space for colorname table."); + pm_asprintf(errorP, "Unable to allocate space for colorname table."); else { pixel * colors; MALLOCARRAY(colors, MAXCOLORNAMES); if (colors == NULL) - asprintfN(errorP, "Unable to allocate space for color table."); + pm_asprintf(errorP, "Unable to allocate space for color table."); else { colorhash_table cht; cht = allocColorHash(); if (cht == NULL) - asprintfN(errorP, "Unable to allocate space for color hash"); + pm_asprintf(errorP, "Unable to allocate space for color hash"); else { readColorFile(fileName, mustOpen, nColorsP, colornames, colors, cht, @@ -682,7 +682,7 @@ ppm_readcolordict(const char * const fileName, if (error) { pm_errormsg("%s", error); - strfree(error); + pm_strfree(error); ppm_freecolorhash(cht); } else { if (chtP) |