| Index: source/tools/tzcode/ialloc.c
|
| diff --git a/source/tools/tzcode/ialloc.c b/source/tools/tzcode/ialloc.c
|
| index 1fc2035f45292b2e8ea101bb681b49bded5ca0c0..b6f018897b42fae10a040189ff93c478a3f7a7f5 100644
|
| --- a/source/tools/tzcode/ialloc.c
|
| +++ b/source/tools/tzcode/ialloc.c
|
| @@ -3,49 +3,12 @@
|
| ** 2006-07-17 by Arthur David Olson.
|
| */
|
|
|
| -#ifndef lint
|
| -#ifndef NOID
|
| -static char elsieid[] = "@(#)ialloc.c 8.30";
|
| -#endif /* !defined NOID */
|
| -#endif /* !defined lint */
|
| -
|
| /*LINTLIBRARY*/
|
|
|
| #include "private.h"
|
|
|
| -#define nonzero(n) (((n) == 0) ? 1 : (n))
|
| -
|
| -char *
|
| -imalloc(n)
|
| -const int n;
|
| -{
|
| - return malloc((size_t) nonzero(n));
|
| -}
|
| -
|
| char *
|
| -icalloc(nelem, elsize)
|
| -int nelem;
|
| -int elsize;
|
| -{
|
| - if (nelem == 0 || elsize == 0)
|
| - nelem = elsize = 1;
|
| - return calloc((size_t) nelem, (size_t) elsize);
|
| -}
|
| -
|
| -void *
|
| -irealloc(pointer, size)
|
| -void * const pointer;
|
| -const int size;
|
| -{
|
| - if (pointer == NULL)
|
| - return imalloc(size);
|
| - return realloc((void *) pointer, (size_t) nonzero(size));
|
| -}
|
| -
|
| -char *
|
| -icatalloc(old, new)
|
| -char * const old;
|
| -const char * const new;
|
| +icatalloc(char *const old, const char *const new)
|
| {
|
| register char * result;
|
| register int oldsize, newsize;
|
| @@ -56,31 +19,14 @@ const char * const new;
|
| else if (newsize == 0)
|
| return old;
|
| else oldsize = strlen(old);
|
| - if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
|
| + if ((result = realloc(old, oldsize + newsize + 1)) != NULL)
|
| if (new != NULL)
|
| (void) strcpy(result + oldsize, new);
|
| return result;
|
| }
|
|
|
| char *
|
| -icpyalloc(string)
|
| -const char * const string;
|
| -{
|
| - return icatalloc((char *) NULL, string);
|
| -}
|
| -
|
| -void
|
| -ifree(p)
|
| -char * const p;
|
| -{
|
| - if (p != NULL)
|
| - (void) free(p);
|
| -}
|
| -
|
| -void
|
| -icfree(p)
|
| -char * const p;
|
| +icpyalloc(const char *const string)
|
| {
|
| - if (p != NULL)
|
| - (void) free(p);
|
| + return icatalloc(NULL, string);
|
| }
|
|
|