sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

talloc: make use of _talloc_free_poolmem() in _talloc_realloc()

Browse Source 
This should follow the same logic...

metze
This commit is contained in:
Stefan Metzmacher 2011-05-16 20:23:13 +02:00
parent 2d514be1ed
commit 14b662ee4f
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/talloc/talloc.c
View File

@ -1550,7 +1550,6 @@ _PUBLIC_ void *_talloc_realloc(const void *context, void *ptr, size_t size, cons
}
new_ptr = talloc_alloc_pool(tc, size + TC_HDR_SIZE);
*talloc_pool_objectcount(pool_tc) -= 1;
if (new_ptr == NULL) {
new_ptr = malloc(TC_HDR_SIZE+size);
@ -1559,21 +1558,8 @@ _PUBLIC_ void *_talloc_realloc(const void *context, void *ptr, size_t size, cons
if (new_ptr) {
memcpy(new_ptr, tc, MIN(tc->size,size) + TC_HDR_SIZE);
TC_INVALIDATE_FULL_CHUNK(tc);
if (*talloc_pool_objectcount(pool_tc) == 1) {
/*
* If the pool is empty now reclaim everything.
*/
pool_tc->pool = TC_POOL_FIRST_CHUNK(pool_tc);
TC_INVALIDATE_POOL(pool_tc);
} else if (next_tc == pool_tc->pool) {
/*
* If it was reallocated and tc was the last
* chunk, we can reclaim the memory of tc.
*/
pool_tc->pool = tc;
}
_talloc_free_poolmem(tc, __location__ "_talloc_realloc");
}
}
else {