diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-03 06:39:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:34 -0500 |
| commit | 1429ed54f14055a1a9399452cb6cfc94f9451cf5 (patch) | |
| tree | 31fe5adaed9e5afe6f886a919078053fa34e7b4f /source4/lib/ldb/common | |
| parent | 15b9736ed30d8e947dbe2513dd9cf27d5b3761af (diff) | |
| download | samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.gz samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.bz2 samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.zip | |
r2792: got rid of talloc_ldb_alloc() and instead created talloc_realloc_fn(),
so talloc now doesn't contain any ldb specific functions.
allow NULL to be passed to a couple more talloc() functions
(This used to be commit 1246f80d806fb5f63cfbf3879de6d546384552a8)
Diffstat (limited to 'source4/lib/ldb/common')
| -rw-r--r-- | source4/lib/ldb/common/ldb_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/common/ldb_alloc.c b/source4/lib/ldb/common/ldb_alloc.c index 6abd6fa8c3..0053c5e73f 100644 --- a/source4/lib/ldb/common/ldb_alloc.c +++ b/source4/lib/ldb/common/ldb_alloc.c @@ -39,7 +39,7 @@ this allows the user to choose their own allocation function */ int ldb_set_alloc(struct ldb_context *ldb, - void *(*alloc)(void *context, void *ptr, size_t size), + void *(*alloc)(const void *context, void *ptr, size_t size), void *context) { ldb->alloc_ops.alloc = alloc; @@ -50,7 +50,7 @@ int ldb_set_alloc(struct ldb_context *ldb, /* this is the default memory allocation function */ -static void *ldb_default_alloc(void *context, void *ptr, size_t size) +static void *ldb_default_alloc(const void *context, void *ptr, size_t size) { /* by setting LDB_ALLOC_OFS to non-zero the test suite can catch any places where we incorrectly use the libc alloc |