From 6c2f050742cfb5b3ff6ee96b106409f541eb53bc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 9 Mar 1995 10:00:12 +0000 Subject: Wed Mar 8 13:38:13 1995 Roland McGrath * posix/glob/configure.bat: Fixes from DJ. * time/backward, time/europe, time/northamerica, time/pacificnew, time/zdump.c, time/zic.c, time/tzfile.h, time/private.h, time/ialloc.c: Code and data updated from ADO's 95b. * time/emkdir.c: File removed. * time/Makefile (distribute, extra-objs, zic): Omit it. * time/localtime.c: Deansideclized. Never #define __tzname et al to non-__ names. * locale/lc-ctype.c (__ctype_tolower, __ctype_toupper): Use int * instead of short int *. * ctype/ctype-info.c: Likewise. * ctype/ctype.h: Likewise. * locale/langinfo.h (_NL_CTYPE_CLASS): Use this (just one) instead of EB and EL versions. --- time/ialloc.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'time/ialloc.c') diff --git a/time/ialloc.c b/time/ialloc.c index d6a1b22b0e..5631947d07 100644 --- a/time/ialloc.c +++ b/time/ialloc.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)ialloc.c 8.24"; +static char elsieid[] = "@(#)ialloc.c 8.28"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -8,13 +8,6 @@ static char elsieid[] = "@(#)ialloc.c 8.24"; #include "private.h" -#ifdef MAL -#define NULLMAL(x) ((x) == NULL || (x) == MAL) -#endif /* defined MAL */ -#ifndef MAL -#define NULLMAL(x) ((x) == NULL) -#endif /* !defined MAL */ - #define nonzero(n) (((n) == 0) ? 1 : (n)) char * icalloc P((int nelem, int elsize)); @@ -28,15 +21,7 @@ char * imalloc(n) const int n; { -#ifdef MAL - register char * result; - - result = malloc((alloc_size_T) nonzero(n)); - return NULLMAL(result) ? NULL : result; -#endif /* defined MAL */ -#ifndef MAL - return malloc((alloc_size_T) nonzero(n)); -#endif /* !defined MAL */ + return malloc((size_t) nonzero(n)); } char * @@ -46,7 +31,7 @@ int elsize; { if (nelem == 0 || elsize == 0) nelem = elsize = 1; - return calloc((alloc_size_T) nelem, (alloc_size_T) elsize); + return calloc((size_t) nelem, (size_t) elsize); } void * @@ -54,9 +39,9 @@ irealloc(pointer, size) void * const pointer; const int size; { - if (NULLMAL(pointer)) + if (pointer == NULL) return imalloc(size); - return realloc((genericptr_T) pointer, (alloc_size_T) nonzero(size)); + return realloc((void *) pointer, (size_t) nonzero(size)); } char * @@ -67,14 +52,14 @@ const char * const new; register char * result; register int oldsize, newsize; - newsize = NULLMAL(new) ? 0 : strlen(new); - if (NULLMAL(old)) + newsize = (new == NULL) ? 0 : strlen(new); + if (old == NULL) oldsize = 0; else if (newsize == 0) return old; else oldsize = strlen(old); if ((result = irealloc(old, oldsize + newsize + 1)) != NULL) - if (!NULLMAL(new)) + if (new != NULL) (void) strcpy(result + oldsize, new); return result; } @@ -90,7 +75,7 @@ void ifree(p) char * const p; { - if (!NULLMAL(p)) + if (p != NULL) (void) free(p); } @@ -98,6 +83,6 @@ void icfree(p) char * const p; { - if (!NULLMAL(p)) + if (p != NULL) (void) free(p); } -- cgit 1.4.1