Make all bucket and overflow addresses unsigned

[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 d0bd6eb..6464ad0 100644 (file)
--- a/usr/src/lib/libc/stdlib/malloc.c
+++ b/usr/src/lib/libc/stdlib/malloc.c
@@ -1,12 +1,13 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%

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

-static char sccsid[] = "@(#)malloc.c   5.6 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)malloc.c   5.11 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

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


@@ -20,9 +21,15 @@ static char sccsid[] = "@(#)malloc.c 5.6 (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 +101,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 +186,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 +228,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;


@@ -261,12 +270,13 @@ 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, 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;