avoid duplicating symbols in libterminfo.

[bsdgames-darwin.git] / hack / alloc.c

diff --git a/hack/alloc.c b/hack/alloc.c
index 9a972a139ba03a50d606d4f424d2ca67a3a05300..8f2405e383e112a5d178bbd7739a070e413dfb2c 100644 (file)
--- a/hack/alloc.c
+++ b/hack/alloc.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: alloc.c,v 1.7 2009/08/12 07:28:40 dholland Exp $       */
+/*     $NetBSD: alloc.c,v 1.9 2011/08/06 20:18:26 dholland Exp $       */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,41 +63,22 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: alloc.c,v 1.7 2009/08/12 07:28:40 dholland Exp $");
+__RCSID("$NetBSD: alloc.c,v 1.9 2011/08/06 20:18:26 dholland Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
 #include "hack.h"
 #include "extern.h"
 
-#ifdef LINT
-
-/*
-   a ridiculous definition, suppressing
-       "possible pointer alignment problem" for (long *) malloc()
-       "enlarg defined but never used"
-       "ftell defined (in <stdio.h>) but never used"
-   from lint
-*/
-long *
-alloc(unsigned n)
+void *
+alloc(size_t len)
 {
-       long            dummy = ftell(stderr);
-       if (n)
-               dummy = 0;      /* make sure arg is used */
-       return (&dummy);
-}
-
-#else
+       void *ptr;
 
-long *
-alloc(unsigned lth)
-{
-       char  *ptr;
-
-       if (!(ptr = malloc(lth)))
-               panic("Cannot get %d bytes", lth);
-       return ((long *) ptr);
+       ptr = malloc(len);
+       if (ptr == NULL)
+               panic("Cannot get %zu bytes", len);
+       return ptr;
 }
 
 #if 0 /* unused */
@@ -111,5 +92,3 @@ enlarge(char *ptr, unsigned lth)
        return ((long *) nptr);
 }
 #endif
-
-#endif /* LINT */