mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
6c2f050742
* 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.
89 lines
1.5 KiB
C
89 lines
1.5 KiB
C
#ifndef lint
|
|
#ifndef NOID
|
|
static char elsieid[] = "@(#)ialloc.c 8.28";
|
|
#endif /* !defined NOID */
|
|
#endif /* !defined lint */
|
|
|
|
/*LINTLIBRARY*/
|
|
|
|
#include "private.h"
|
|
|
|
#define nonzero(n) (((n) == 0) ? 1 : (n))
|
|
|
|
char * icalloc P((int nelem, int elsize));
|
|
char * icatalloc P((char * old, const char * new));
|
|
char * icpyalloc P((const char * string));
|
|
char * imalloc P((int n));
|
|
void * irealloc P((void * pointer, int size));
|
|
void ifree P((char * pointer));
|
|
|
|
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;
|
|
{
|
|
register char * result;
|
|
register int oldsize, newsize;
|
|
|
|
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 (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;
|
|
{
|
|
if (p != NULL)
|
|
(void) free(p);
|
|
}
|