upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc cleanup

Browse source
This commit is contained in:
Jong Hyuk Choi 2004-12-08 08:12:15 +00:00
parent c9ea959728
commit 4984e157b1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servers/slapd/sl_malloc.c
View file

@ -207,9 +207,13 @@ slap_sl_mem_create(
sh->sh_map = (unsigned char **)
ch_malloc(order * sizeof(unsigned char *));
for (i = 0; i < order; i++) {
sh->sh_map[i] = (unsigned char *)
ch_malloc(size >> (1 << (order_start + i + 3)));
memset(sh->sh_map[i], 0, size >> (1 << (order_start + i + 3)));
int shiftamt = order_start + 1 + i;
int nummaps = size >> shiftamt;
assert(nummaps);
nummaps >>= 3;
if (!nummaps) nummaps = 1;
sh->sh_map[i] = (unsigned char *) ch_malloc(nummaps);
memset(sh->sh_map[i], 0, nummaps);
}
sh->sh_stack = stack;
return sh;
@ -248,8 +252,6 @@ slap_sl_malloc(
/* ber_set_option calls us like this */
if (!ctx) return ber_memalloc_x(size, NULL);
Debug(LDAP_DEBUG_TRACE, "==> slap_sl_malloc (%d)\n", size, 0, 0);
/* round up to doubleword boundary */
size += sizeof(ber_len_t) + pad;
size &= ~pad;
@ -413,8 +415,6 @@ slap_sl_free(void *ptr, void *ctx)
unsigned long diff;
int i, k, inserted = 0;
Debug( LDAP_DEBUG_TRACE, "==> slap_sl_free \n", 0, 0, 0);
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) {