From 28ed9cda2a47c17130ee5b97588695ed3acb4e45 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 29 Sep 2010 21:45:56 +0000 Subject: 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 --- lib/libpamn.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lib/libpamn.c') diff --git a/lib/libpamn.c b/lib/libpamn.c index 76a8bb6d..b4d5435c 100644 --- a/lib/libpamn.c +++ b/lib/libpamn.c @@ -40,9 +40,10 @@ allocpamrown(const struct pam * const pamP, tuplerown = malloc(pamP->width * (sizeof(tuplen *) + bytes_per_tuple)); if (tuplerown == NULL) - asprintfN(&error, "Out of memory allocating space for a tuple row of" - "%u tuples by %u samples per tuple by %u bytes per sample.", - pamP->width, pamP->depth, (unsigned)sizeof(samplen)); + pm_asprintf(&error, "Out of memory allocating space for a tuple row of" + "%u tuples by %u samples per tuple " + "by %u bytes per sample.", + pamP->width, pamP->depth, (unsigned)sizeof(samplen)); else { /* Now we initialize the pointers to the individual tuples to make this a regulation C two dimensional array. @@ -78,7 +79,7 @@ pnm_allocpamrown(const struct pam * const pamP) { if (error) { pm_errormsg("pnm_allocpamrown() failed. %s", error); - strfree(error); + pm_strfree(error); pm_longjmp(); } @@ -279,9 +280,9 @@ pnm_allocpamarrayn(const struct pam * const pamP) { MALLOCARRAY(tuplenarray, pamP->height); if (tuplenarray == NULL) - asprintfN(&error, - "Out of memory allocating the row pointer section of " - "a %u row array", pamP->height); + pm_asprintf(&error, + "Out of memory allocating the row pointer section of " + "a %u row array", pamP->height); else { unsigned int rowsDone; @@ -302,7 +303,7 @@ pnm_allocpamarrayn(const struct pam * const pamP) { } if (error) { pm_errormsg("pnm_allocpamarrayn() failed. %s", error); - strfree(error); + pm_strfree(error); pm_longjmp(); } -- cgit 1.4.1