Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / sl_malloc.c

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 070cb8d43f234e78eb73b5916f538d42426c731f..e40e86480705a5b86d57b2f01d83b66df293add8 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -18,7 +18,7 @@ struct slab_heap {
        void *h_end;
 };
 
-static void
+void
 sl_mem_destroy(
        void *key,
        void *data
@@ -64,14 +64,24 @@ sl_mem_create(
                sh = ch_malloc( sizeof(struct slab_heap) );
                sh->h_base = ch_malloc( size );
                ldap_pvt_thread_pool_setkey( ctx, sl_mem_init, (void *)sh, sl_mem_destroy );
-       } else if ( size > sh->h_end - sh->h_base ) {
+       } else if ( size > (char *) sh->h_end - (char *) sh->h_base ) {
                sh->h_base = ch_realloc( sh->h_base, size );
        }
        sh->h_last = sh->h_base;
-       sh->h_end = sh->h_base + size;
+       sh->h_end = (char *) sh->h_base + size;
        return sh;
 }
 
+void
+sl_mem_detach(
+       void *ctx,
+       void *memctx
+)
+{
+       /* separate from context */
+       ldap_pvt_thread_pool_setkey( ctx, sl_mem_init, NULL, NULL );
+}
+
 void *
 sl_malloc(
     ber_len_t  size,
@@ -89,7 +99,7 @@ sl_malloc(
        size += pad + sizeof( ber_len_t );
        size &= ~pad;
 
-       if (sh->h_last + size >= sh->h_end ) {
+       if ((char *) sh->h_last + size >= (char *) sh->h_end ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO, 
                           "sl_malloc of %lu bytes failed, using ch_malloc\n", (long)size, 0,0 );
@@ -101,7 +111,7 @@ sl_malloc(
        }
        new = sh->h_last;
        *new++ = size - sizeof(ber_len_t);
-       sh->h_last += size;
+       sh->h_last = (char *) sh->h_last + size;
        
        return( (void *)new );
 }
@@ -162,7 +172,7 @@ sl_realloc( void *ptr, ber_len_t size, void *ctx )
        /* If reallocing the last block, we can grow it */
        } else if ( (char *)ptr + p[-1] == sh->h_last ) {
                new = p;
-               sh->h_last += size - p[-1];
+               sh->h_last = (char *) sh->h_last + size - p[-1];
                p[-1] = size;
        
        /* Nowhere to grow, need to alloc and copy */