diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:20:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:26 -0500 |
| commit | e159e42d8472f36f51e400e351fc43f2a7dc44f5 (patch) | |
| tree | 641b7a3f25e77a4b8b1c2724287cd243119c411a /source4/lib/talloc/talloc.h | |
| parent | ddc10d4d37984246a6547e34a32d629c689c40d1 (diff) | |
| download | samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.gz samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.bz2 samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.zip | |
r4550: talloc() is now typesafe. It is exactly equivalent to the old talloc_p() macro. Use
talloc_size() if you want the old behaviour.
I have kept talloc_p() as an alias for now. Once we change all calls
to be plain talloc() then we can remove it.
(This used to be commit 2011bbeb841fd6bfccf3d44a49f79203f7f55baa)
Diffstat (limited to 'source4/lib/talloc/talloc.h')
| -rw-r--r-- | source4/lib/talloc/talloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h index 99a6b7a770..747b1c6ba6 100644 --- a/source4/lib/talloc/talloc.h +++ b/source4/lib/talloc/talloc.h @@ -33,11 +33,11 @@ typedef void TALLOC_CTX; #define __location__ __FILE__ ":" __LINESTR__ /* useful macros for creating type checked pointers */ -#define talloc(ctx, size) talloc_named_const(ctx, size, __location__) +#define talloc(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) +#define talloc_p(ctx, type) talloc(ctx, type) #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__) #define talloc_zero(ctx, size) _talloc_zero(ctx, size, __location__) #define talloc_realloc(ctx, ptr, size) _talloc_realloc(ctx, ptr, size, __location__) -#define talloc_p(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) #define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__) #define talloc_zero_p(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type) #define talloc_zero_array_p(ctx, type, count) (type *)talloc_zero_array(ctx, sizeof(type), count, __location__) |