summaryrefslogtreecommitdiff
path: root/lib/talloc/talloc.h
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-03-22 22:07:58 +0100
committerVolker Lendecke <vl@samba.org>2009-03-22 22:10:09 +0100
commit979a1b06d01817a01967d9137e4f70f222fa8eab (patch)
tree7b00e03e8b7b169ea1c4023f84270b42fdc61a73 /lib/talloc/talloc.h
parent1bff89c4ad1cb76c8fec1ba9bcebfbd0da5ee15e (diff)
downloadsamba-979a1b06d01817a01967d9137e4f70f222fa8eab.tar.gz
samba-979a1b06d01817a01967d9137e4f70f222fa8eab.tar.bz2
samba-979a1b06d01817a01967d9137e4f70f222fa8eab.zip
talloc_array_length: talloc_get_size deals fine with NULL
Diffstat (limited to 'lib/talloc/talloc.h')
-rw-r--r--lib/talloc/talloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 5c8d5c5fe2..f87564a13b 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -94,7 +94,7 @@ typedef void TALLOC_CTX;
#define talloc_array(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
#define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count, __location__)
#define talloc_array_ptrtype(ctx, ptr, count) (_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count)
-#define talloc_array_length(ctx) ((ctx) ? talloc_get_size(ctx)/sizeof(*ctx) : 0)
+#define talloc_array_length(ctx) (talloc_get_size(ctx)/sizeof(*ctx))
#define talloc_realloc(ctx, p, type, count) (type *)_talloc_realloc_array(ctx, p, sizeof(type), count, #type)
#define talloc_realloc_size(ctx, ptr, size) _talloc_realloc(ctx, ptr, size, __location__)