system_cmds-790.tar.gz

[apple/system_cmds.git] / zic.tproj / ialloc.c

diff --git a/zic.tproj/ialloc.c b/zic.tproj/ialloc.c
index fabe0c64e68f442804c41e50b1e2b3923c3f9008..dda367b089765f599231a9366c355ffe4a795ba3 100644 (file)
--- a/zic.tproj/ialloc.c
+++ b/zic.tproj/ialloc.c
@@ -1,13 +1,17 @@
-#include <sys/cdefs.h>
+/*
+** This file is in the public domain, so clarified as of
+** 2006-07-17 by Arthur David Olson.
+*/
+
 #ifndef lint
 #ifndef NOID
-__unused static const char     elsieid[] = "@(#)ialloc.c       8.29";
+static const char      elsieid[] = "@(#)ialloc.c       8.30";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
 #ifndef lint
-__unused static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/zic/ialloc.c,v 1.6 2000/11/28 18:18:56 charnier Exp $";
+static const char rcsid[] =
+  "$FreeBSD: head/contrib/tzcode/zic/ialloc.c 192625 2009-05-23 06:31:50Z edwin $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
@@ -17,32 +21,39 @@ __unused static const char rcsid[] =
 #define nonzero(n)     (((n) == 0) ? 1 : (n))
 
 char *
-imalloc(const size_t n)
+imalloc(n)
+const int      n;
 {
-       return malloc(nonzero(n));
+       return malloc((size_t) nonzero(n));
 }
 
 char *
-icalloc(size_t nelem, size_t elsize)
+icalloc(nelem, elsize)
+int    nelem;
+int    elsize;
 {
        if (nelem == 0 || elsize == 0)
                nelem = elsize = 1;
-       return calloc(nelem, elsize);
+       return calloc((size_t) nelem, (size_t) elsize);
 }
 
 void *
-irealloc(void * const pointer, const size_t size)
+irealloc(pointer, size)
+void * const   pointer;
+const int      size;
 {
        if (pointer == NULL)
                return imalloc(size);
-       return realloc((void *) pointer, nonzero(size));
+       return realloc((void *) pointer, (size_t) nonzero(size));
 }
 
 char *
-icatalloc(char * const old, const char * const new)
+icatalloc(old, new)
+char * const           old;
+const char * const     new;
 {
-       char *  result;
-       size_t  oldsize, newsize;
+       register char * result;
+       register int    oldsize, newsize;
 
        newsize = (new == NULL) ? 0 : strlen(new);
        if (old == NULL)
@@ -57,20 +68,23 @@ icatalloc(char * const old, const char * const new)
 }
 
 char *
-icpyalloc(const char * const string)
+icpyalloc(string)
+const char * const     string;
 {
        return icatalloc((char *) NULL, string);
 }
 
 void
-ifree(char * const p)
+ifree(p)
+char * const   p;
 {
        if (p != NULL)
                (void) free(p);
 }
 
 void
-icfree(char * const p)
+icfree(p)
+char * const   p;
 {
        if (p != NULL)
                (void) free(p);