void *h_end;
};
-static void
+void
sl_mem_destroy(
void *key,
void *data
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,
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 );
}
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 );
}
/* 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 */