BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / stdlib / malloc.c

diff --git a/usr/src/lib/libc/stdlib/malloc.c b/usr/src/lib/libc/stdlib/malloc.c
index 7c8d652..df60e3e 100644 (file)
--- a/usr/src/lib/libc/stdlib/malloc.c
+++ b/usr/src/lib/libc/stdlib/malloc.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)malloc.c   5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)malloc.c   5.11 (Berkeley) 2/23/91";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -21,9 +47,15 @@ static char sccsid[] = "@(#)malloc.c 5.9 (Berkeley) %G%";
  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

 
 #define        NULL 0
 
 
 #define        NULL 0
 

+static void morecore();
+static int findbucket();
+

 /*
  * The overhead on a block is at least 4 bytes.  When free, this space
  * contains a pointer to the next free block, and the bottom two bits must
 /*
  * The overhead on a block is at least 4 bytes.  When free, this space
  * contains a pointer to the next free block, and the bottom two bits must


@@ -95,9 +127,9 @@ botch(s)
 #define        ASSERT(p)
 #endif
 
 #define        ASSERT(p)
 #endif
 

-char *
+void *

 malloc(nbytes)
 malloc(nbytes)

-       unsigned nbytes;
+       size_t nbytes;

 {
        register union overhead *op;
        register int bucket, n;
 {
        register union overhead *op;
        register int bucket, n;


@@ -180,6 +212,7 @@ malloc(nbytes)
 /*
  * Allocate more memory to the indicated bucket.
  */
 /*
  * Allocate more memory to the indicated bucket.
  */

+static void

 morecore(bucket)
        int bucket;
 {
 morecore(bucket)
        int bucket;
 {


@@ -221,8 +254,9 @@ morecore(bucket)
        }
 }
 
        }
 }
 

+void

 free(cp)
 free(cp)

-       char *cp;
+       void *cp;

 {   
        register int size;
        register union overhead *op;
 {   
        register int size;
        register union overhead *op;


@@ -262,10 +296,10 @@ free(cp)
  */
 int realloc_srchlen = 4;       /* 4 should be plenty, -1 =>'s whole list */
 
  */
 int realloc_srchlen = 4;       /* 4 should be plenty, -1 =>'s whole list */
 

-char *
+void *

 realloc(cp, nbytes)
 realloc(cp, nbytes)

-       char *cp; 
-       unsigned nbytes;
+       void *cp; 
+       size_t nbytes;

 {   
        register u_int onb;
        register int i;
 {   
        register u_int onb;
        register int i;