summaryrefslogtreecommitdiff
path: root/source3/lib/talloc/talloc.h
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-15 22:58:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:31 -0500
commit247e1667b00354d0407b8f3de2dc11ba751b1918 (patch)
tree891dc2cf42d835c79d5ec2c9392576c56217f56d /source3/lib/talloc/talloc.h
parentb49f0ae01875a2f4fd8f56c8cd2d4ff42b998ef4 (diff)
downloadsamba-247e1667b00354d0407b8f3de2dc11ba751b1918.tar.gz
samba-247e1667b00354d0407b8f3de2dc11ba751b1918.tar.bz2
samba-247e1667b00354d0407b8f3de2dc11ba751b1918.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 (This used to be commit c718eb7a7c3cdc4acb25f303a73a3ca478c27af0)
Diffstat (limited to 'source3/lib/talloc/talloc.h')
-rw-r--r--source3/lib/talloc/talloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/talloc/talloc.h b/source3/lib/talloc/talloc.h
index 27d7d2c423..75c130a275 100644
--- a/source3/lib/talloc/talloc.h
+++ b/source3/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);