BSD 4_4 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 0477d3c..ea8f092 100644 (file)
--- a/usr/src/lib/libc/stdlib/malloc.c
+++ b/usr/src/lib/libc/stdlib/malloc.c
@@ -1,12 +1,39 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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.

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)malloc.c   5.5 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)malloc.c   8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * malloc.c (Caltech) 2/21/82
 
 /*
  * malloc.c (Caltech) 2/21/82


@@ -20,9 +47,15 @@ static char sccsid[] = "@(#)malloc.c 5.5 (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


@@ -94,13 +127,13 @@ 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 union overhead *op;

-       register int bucket;
-       register unsigned amt, n;
+       register int bucket, n;
+       register unsigned amt;

 
        /*
         * First time malloc is called, setup page size and
 
        /*
         * First time malloc is called, setup page size and


@@ -179,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;
 {


@@ -220,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;


@@ -255,18 +290,19 @@ free(cp)
  * back.  We have to search all the free lists for the block in order
  * to determine its bucket: 1st we make one pass thru the lists
  * checking only the first block in each; if that fails we search
  * back.  We have to search all the free lists for the block in order
  * to determine its bucket: 1st we make one pass thru the lists
  * checking only the first block in each; if that fails we search

- * ``realloc_srchlen'' blocks in each list for a match (the variable
+ * ``__realloc_srchlen'' blocks in each list for a match (the variable

  * is extern so the caller can modify it).  If that fails we just copy
  * however many bytes was given to realloc() and hope it's not huge.
  */
  * is extern so the caller can modify it).  If that fails we just copy
  * however many bytes was given to realloc() and hope it's not huge.
  */

-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, i;
+       register u_int onb;
+       register int i;

        union overhead *op;
        char *res;
        int was_alloced = 0;
        union overhead *op;
        char *res;
        int was_alloced = 0;


@@ -284,7 +320,7 @@ realloc(cp, nbytes)
                 * Search for the old block of memory on the
                 * free list.  First, check the most common
                 * case (last element free'd), then (this failing)
                 * Search for the old block of memory on the
                 * free list.  First, check the most common
                 * case (last element free'd), then (this failing)

-                * the last ``realloc_srchlen'' items free'd.
+                * the last ``__realloc_srchlen'' items free'd.

                 * If all lookups fail, then assume the size of
                 * the memory block being realloc'd is the
                 * largest possible (so that all "nbytes" of new
                 * If all lookups fail, then assume the size of
                 * the memory block being realloc'd is the
                 * largest possible (so that all "nbytes" of new


@@ -293,7 +329,7 @@ realloc(cp, nbytes)
                 * is gibbous.  However, that is very unlikely.
                 */
                if ((i = findbucket(op, 1)) < 0 &&
                 * is gibbous.  However, that is very unlikely.
                 */
                if ((i = findbucket(op, 1)) < 0 &&

-                   (i = findbucket(op, realloc_srchlen)) < 0)
+                   (i = findbucket(op, __realloc_srchlen)) < 0)

                        i = NBUCKETS;
        }
        onb = 1 << (i + 3);
                        i = NBUCKETS;
        }
        onb = 1 << (i + 3);