summaryrefslogtreecommitdiffstats
path: root/source/lib/talloc/talloc.h
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-15 22:58:06 +0000
committerStefan Metzmacher <metze@samba.org>2006-12-15 22:58:06 +0000
commit3ea007afefa661aba6cd21d8f27f12937622f902 (patch)
treec7b28cd782f1f0cdacf51a2d9c04190bd618eb5f /source/lib/talloc/talloc.h
parent455d94f16e7cadf5e8d4f55d3b6e75e0403cf964 (diff)
downloadsamba-3ea007afefa661aba6cd21d8f27f12937622f902.tar.gz
samba-3ea007afefa661aba6cd21d8f27f12937622f902.tar.xz
samba-3ea007afefa661aba6cd21d8f27f12937622f902.zip
r20197: merge talloc fixes from samba4:
- make most static functions inline - handle NULL pointers in talloc_parent_chunk() - use talloc_parent_chunk() in talloc_parent_name() to fix a bug found by the IBM checker metze
Diffstat (limited to 'source/lib/talloc/talloc.h')
-rw-r--r--source/lib/talloc/talloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/lib/talloc/talloc.h b/source/lib/talloc/talloc.h
index 27d7d2c423f..75c130a2756 100644
--- a/source/lib/talloc/talloc.h
+++ b/source/lib/talloc/talloc.h
@@ -123,7 +123,7 @@ void *talloc_named_const(const void *context, size_t size, const char *name);
const char *talloc_get_name(const void *ptr);
void *talloc_check_name(const void *ptr, const char *name);
void *talloc_parent(const void *ptr);
-const char *talloc_parent_name(const void *context);
+const char *talloc_parent_name(const void *ptr);
void *talloc_init(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
int talloc_free(void *ptr);
void talloc_free_children(void *ptr);