diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-07-10 16:47:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:01 -0500 |
| commit | ec2b3baf09ebff97bc958e73591e128f14c7a378 (patch) | |
| tree | 98ffd42a9a4234ff45a657e9dee0adf28f0e5714 | |
| parent | 5468516f9af10cb3c67bc93c610c22b5383e20db (diff) | |
| download | samba-ec2b3baf09ebff97bc958e73591e128f14c7a378.tar.gz samba-ec2b3baf09ebff97bc958e73591e128f14c7a378.tar.bz2 samba-ec2b3baf09ebff97bc958e73591e128f14c7a378.zip | |
r16922: move some macros out of talloc.h as the don't belong to talloc
metze
(This used to be commit 4c68e315e2288eef97527911daf18622a994ac31)
| -rw-r--r-- | source4/lib/talloc/talloc.h | 8 | ||||
| -rw-r--r-- | source4/lib/util/util.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h index d71e60cb45..a4eef14bd0 100644 --- a/source4/lib/talloc/talloc.h +++ b/source4/lib/talloc/talloc.h @@ -86,14 +86,6 @@ typedef void TALLOC_CTX; #define talloc_memdup(t, p, size) _talloc_memdup(t, p, size, __location__) -#define malloc_p(type) (type *)malloc(sizeof(type)) -#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count) -#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count) - -#define data_blob(ptr, size) data_blob_named(ptr, size, "DATA_BLOB: "__location__) -#define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr, size, "DATA_BLOB: "__location__) -#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob)->data, (blob)->length, "DATA_BLOB: "__location__) - #define talloc_set_type(ptr, type) talloc_set_name_const(ptr, #type) #define talloc_get_type(ptr, type) (type *)talloc_check_name(ptr, #type) diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h index f1a6fc4c30..2517966d90 100644 --- a/source4/lib/util/util.h +++ b/source4/lib/util/util.h @@ -100,6 +100,10 @@ extern const char *panic_action; */ #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count) +#define data_blob(ptr, size) data_blob_named(ptr, size, "DATA_BLOB: "__location__) +#define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr, size, "DATA_BLOB: "__location__) +#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob)->data, (blob)->length, "DATA_BLOB: "__location__) + #if defined(VALGRIND) #define strlen(x) valgrind_strlen(x) #endif |