summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-27 23:18:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:44 -0500
commit12ba88574bf91bdcc4447bfc3d429b799064bfd9 (patch)
tree17f9b68292eb277da8c71871f8cad332c43d3a5a /source3/include
parentfdc0b87083496ae9d6d9d3d1d1a71dddaca24da2 (diff)
downloadsamba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.gz
samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.bz2
samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.zip
r22542: Move over to using the _strict varients of the talloc
calls. No functional changes. Looks bigger than it is :-). Jeremy. (This used to be commit f6fa3080fee1b20df9f1968500840a88cf0ee592)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb_macros.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 4a49ef3ed4..f93ed912ee 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -271,17 +271,19 @@ copy an IP address from one buffer to another
/* The new talloc is paranoid malloc checker safe. */
-#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
-#define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
-#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
-#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup(ctx, ptr, size, __location__)
-#define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__)
-#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
-#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
+#define TALLOC(ctx, size) talloc_strict(ctx, size, __location__)
+#define TALLOC_P(ctx, type) (type *)talloc_strict(ctx, sizeof(type), #type)
+#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array_strict(ctx, sizeof(type), count, #type)
+#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup_strict(ctx, ptr, size, __location__)
+#define TALLOC_ZERO(ctx, size) _talloc_zero_strict(ctx, size, __location__)
+#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_strict(ctx, sizeof(type), #type)
+#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_strict(ctx, sizeof(type), count, #type)
#define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__)
#define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
#define talloc_destroy(ctx) talloc_free(ctx)
#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
+#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size)
+#define TALLOC_ZERO_SIZE(ctx, size) talloc_zero_size_strict(ctx, size)
/* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling
the smbmount utils */