summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2005-05-07 16:04:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:49 -0500
commit8f09abffd3d58f419a55159dadc7ae099b59595f (patch)
tree95d2edff9ad9efd63d955f2498e573dd1e123261
parentf1714eacf7365c731f6802972bff3fc62e72b8d0 (diff)
downloadsamba-8f09abffd3d58f419a55159dadc7ae099b59595f.tar.gz
samba-8f09abffd3d58f419a55159dadc7ae099b59595f.tar.bz2
samba-8f09abffd3d58f419a55159dadc7ae099b59595f.zip
r6646: keep samba3 talloc inline with samba4 one
(This used to be commit 4deebbbe50932792621114bf1e74b0c994bda7be)
-rw-r--r--source3/include/talloc.h1
-rw-r--r--source3/lib/talloc.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/source3/include/talloc.h b/source3/include/talloc.h
index a4f19d3587..738506e323 100644
--- a/source3/include/talloc.h
+++ b/source3/include/talloc.h
@@ -122,6 +122,7 @@ void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count, const
void *_talloc_realloc_array(const void *ctx, void *ptr, size_t el_size, unsigned count, const char *name);
void *talloc_realloc_fn(const void *context, void *ptr, size_t size);
void *talloc_autofree_context(void);
+size_t talloc_get_size(const void *ctx);
#endif
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index da3a2300b0..4aeac5fef2 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -1081,4 +1081,13 @@ void *talloc_autofree_context(void)
return cleanup_context;
}
+size_t talloc_get_size(const void *context) {
+ struct talloc_chunk *tc;
+
+ if (context == NULL)
+ return 0;
+ tc = talloc_chunk_from_ptr(context);
+
+ return tc->size;
+}