X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fsl_malloc.c;h=15c5b4da395dc52e68366ffcde996425f48f78ff;hb=113727ba53c91ab6f1b0880c5908eca43b89ec4e;hp=e635cafc62dc474ea387c44bf38fe5e8b7142dc4;hpb=4c0e4741f75ca503f25493ab44be7133a2389b95;p=openldap
diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index e635cafc62..15c5b4da39 100644
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -1,8 +1,17 @@
/* sl_malloc.c - malloc routines using a per-thread slab */
/* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -54,7 +63,7 @@ sl_mem_create(
struct slab_heap *sh = NULL;
int pad = 2*sizeof(int)-1;
- ldap_pvt_thread_pool_getkey( ctx, sl_mem_init, (void **)&sh, NULL );
+ ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
/* round up to doubleword boundary */
size += pad;
@@ -63,7 +72,7 @@ sl_mem_create(
if (!sh) {
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 );
+ ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, (void *)sh, sl_mem_destroy );
} else if ( size > (char *) sh->h_end - (char *) sh->h_base ) {
sh->h_base = ch_realloc( sh->h_base, size );
}
@@ -79,14 +88,7 @@ sl_mem_detach(
)
{
/* separate from context */
- ldap_pvt_thread_pool_setkey( ctx, sl_mem_init, NULL, NULL );
-
- /* The code used to try to use realloc to shrink the region.
- * This is unsafe, since realloc may return a different block
- * of memory from what was passed in, and the region contains
- * pointers that reference itself. After realloc, these pointers
- * are invalid, and crashes result.
- */
+ ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, NULL, NULL );
}
void *
@@ -204,27 +206,6 @@ sl_free( void *ptr, void *ctx )
}
}
-void
-sl_release( void *ptr, void *ctx )
-{
- struct slab_heap *sh = ctx;
-
- if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
- sh->h_last = ptr;
- }
-}
-
-void *
-sl_mark( void *ctx )
-{
- struct slab_heap *sh = ctx;
- void *ret = NULL;
-
- if (sh) ret = sh->h_last;
-
- return ret;
-}
-
void *
sl_context( void *ptr )
{
@@ -233,7 +214,7 @@ sl_context( void *ptr )
ctx = ldap_pvt_thread_pool_context();
- ldap_pvt_thread_pool_getkey( ctx, sl_mem_init, (void **)&sh, NULL );
+ ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
return sh;