More ldapbis cleanup

[openldap] / servers / slapd / sl_malloc.c

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index adf19ca9c8f1ff0408044539061f2a25f8ea2cde..b19507ab2adb324d0bcf5a7154bfe85706d22961 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,9 @@
 #include "slap.h"
 
 static struct slab_object * slap_replenish_sopool(struct slab_heap* sh);
+#ifdef SLAPD_UNUSED
 static void print_slheap(int level, void *ctx);
+#endif
 
 void
 slap_sl_mem_destroy(
@@ -126,7 +128,11 @@ slap_sl_mem_create(
                                (void *)sh, slap_sl_mem_destroy);
 #endif
                } else if ( size > (char *)sh->sh_end - (char *)sh->sh_base ) {
-                       sh->sh_base = ch_realloc(sh->sh_base, size);
+                       void    *newptr;
+
+                       newptr = ch_realloc( sh->sh_base, size );
+                       if ( newptr == NULL ) return NULL;
+                       sh->sh_base = newptr;
                }
                sh->sh_last = sh->sh_base;
                sh->sh_end = (char *) sh->sh_base + size;
@@ -183,7 +189,11 @@ slap_sl_mem_create(
                        }
 
                        if (size > (char *)sh->sh_end - (char *)sh->sh_base) {
-                               sh->sh_base = realloc(sh->sh_base, size);
+                               void    *newptr;
+
+                               newptr = realloc( sh->sh_base, size );
+                               if ( newptr == NULL ) return NULL;
+                               sh->sh_base = newptr;
                        }
                }
                sh->sh_end = (char *)sh->sh_base + size;
@@ -247,10 +257,14 @@ slap_sl_malloc(
        int pad = 2*sizeof(int)-1, pad_shift;
        int order = -1, order_start = -1;
        struct slab_object *so_new, *so_left, *so_right;
-       ber_len_t *ptr, *new;
+       ber_len_t *ptr, *newptr;
        unsigned long diff;
        int i, j;
 
+#ifdef SLAP_NO_SL_MALLOC
+       return ber_malloc_x( size, NULL );
+#endif
+
        /* ber_set_option calls us like this */
        if (!ctx) return ber_memalloc_x(size, NULL);
 
@@ -265,10 +279,10 @@ slap_sl_malloc(
                                (long)size, 0, 0);
                        return ch_malloc(size);
                }
-               new = sh->sh_last;
-               *new++ = size - sizeof(ber_len_t);
+               newptr = sh->sh_last;
+               *newptr++ = size - sizeof(ber_len_t);
                sh->sh_last = (char *) sh->sh_last + size;
-               return( (void *)new );
+               return( (void *)newptr );
        } else {
                size_shift = size - 1;
                do {
@@ -336,13 +350,13 @@ slap_sl_malloc(
 void *
 slap_sl_calloc( ber_len_t n, ber_len_t size, void *ctx )
 {
-       void *new;
+       void *newptr;
 
-       new = slap_sl_malloc( n*size, ctx );
-       if ( new ) {
-               memset( new, 0, n*size );
+       newptr = slap_sl_malloc( n*size, ctx );
+       if ( newptr ) {
+               memset( newptr, 0, n*size );
        }
-       return new;
+       return newptr;
 }
 
 void *
@@ -350,17 +364,21 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
 {
        struct slab_heap *sh = ctx;
        int pad = 2*sizeof(int) -1;
-       ber_len_t *p = (ber_len_t *)ptr, *new;
+       ber_len_t *p = (ber_len_t *)ptr, *newptr;
 
        if (ptr == NULL)
                return slap_sl_malloc(size, ctx);
 
+#ifdef SLAP_NO_SL_MALLOC
+       return ber_memrealloc_x( ptr, size, NULL );
+#endif
+
        /* Not our memory? */
        if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
                /* duplicate of realloc behavior, oh well */
-               new = ber_memrealloc_x(ptr, size, NULL);
-               if (new) {
-                       return new;
+               newptr = ber_memrealloc_x(ptr, size, NULL);
+               if (newptr) {
+                       return newptr;
                }
                Debug(LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
                                (long) size, 0, 0);
@@ -380,31 +398,32 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
 
                /* Never shrink blocks */
                if (size <= p[-1]) {
-                       new = p;
+                       newptr = p;
        
                /* If reallocing the last block, we can grow it */
                } else if ((char *)ptr + p[-1] == sh->sh_last &&
                        (char *)ptr + size < (char *)sh->sh_end ) {
-                       new = p;
+                       newptr = p;
                        sh->sh_last = (char *)sh->sh_last + size - p[-1];
                        p[-1] = size;
        
                /* Nowhere to grow, need to alloc and copy */
                } else {
-                       new = slap_sl_malloc(size, ctx);
-                       AC_MEMCPY(new, ptr, p[-1]);
+                       newptr = slap_sl_malloc(size, ctx);
+                       AC_MEMCPY(newptr, ptr, p[-1]);
                }
-               return new;
+               return newptr;
        } else {
-               void *newptr;
-               newptr = slap_sl_malloc(size, ctx);
+               void *newptr2;
+
+               newptr2 = slap_sl_malloc(size, ctx);
                if (size < p[-1]) {
-                       AC_MEMCPY(newptr, ptr, size);
+                       AC_MEMCPY(newptr2, ptr, size);
                } else {
-                       AC_MEMCPY(newptr, ptr, p[-1]);
+                       AC_MEMCPY(newptr2, ptr, p[-1]);
                }
                slap_sl_free(ptr, ctx);
-               return newptr;
+               return newptr2;
        }
 }
 
@@ -420,6 +439,14 @@ slap_sl_free(void *ptr, void *ctx)
        unsigned long diff;
        int i, inserted = 0;
 
+       if (!ptr)
+               return;
+
+#ifdef SLAP_NO_SL_MALLOC
+       ber_memfree_x( ptr, NULL );
+       return;
+#endif
+
        if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
                ber_memfree_x(ptr, NULL);
        } else if (sh->sh_stack && (char *)ptr + p[-1] == sh->sh_last) {
@@ -477,7 +504,7 @@ slap_sl_free(void *ptr, void *ctx)
                                                Debug(LDAP_DEBUG_TRACE, "slap_sl_free: "
                                                        "free object not found while bit is clear.\n",
                                                        0, 0, 0);
-                                               assert(so);
+                                               assert(so != NULL);
 
                                        }
                                } else {
@@ -527,7 +554,7 @@ slap_sl_free(void *ptr, void *ctx)
                                                Debug(LDAP_DEBUG_TRACE, "slap_sl_free: "
                                                        "free object not found while bit is clear.\n",
                                                        0, 0, 0 );
-                                               assert( so );
+                                               assert(so != NULL);
 
                                        }
                                } else {
@@ -598,6 +625,7 @@ slap_replenish_sopool(
     return so_block;
 }
 
+#ifdef SLAPD_UNUSED
 static void
 print_slheap(int level, void *ctx)
 {
@@ -638,3 +666,4 @@ print_slheap(int level, void *ctx)
                }
        }
 }
+#endif