diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:03:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 8459391e31079066745a65c5f3c07f3899afdc0c (patch) | |
| tree | 2a77cdcfd6ff27be80d34b88cfaef7b1c962004e /source3/include | |
| parent | 9f02fb51d41c2c2bf285ab6d25138f0b7b0cba81 (diff) | |
| download | samba-8459391e31079066745a65c5f3c07f3899afdc0c.tar.gz samba-8459391e31079066745a65c5f3c07f3899afdc0c.tar.bz2 samba-8459391e31079066745a65c5f3c07f3899afdc0c.zip | |
s3-talloc Remove unused TALLOC zeronull functions and macro definitions
These have been under #if 0 for a long time now.
Andrew Bartlett
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 21 |
2 files changed, 0 insertions, 26 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 10a84f9050..c04dc94e20 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -608,11 +608,6 @@ void split_domain_user(TALLOC_CTX *mem_ctx, const char *full_name, char **domain, char **user); -void *_talloc_zero_zeronull(const void *ctx, size_t size, const char *name); -void *_talloc_memdup_zeronull(const void *t, const void *p, size_t size, const char *name); -void *_talloc_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name); -void *_talloc_zero_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name); -void *talloc_zeronull(const void *context, size_t size, const char *name); const char *strip_hostname(const char *s); bool tevent_req_poll_ntstatus(struct tevent_req *req, struct tevent_context *ev, diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index f7cfaaf325..ccf99daaea 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -218,25 +218,6 @@ copy an IP address from one buffer to another #define SMB_XMALLOC_P(type) (type *)smb_xmalloc_array(sizeof(type),1) #define SMB_XMALLOC_ARRAY(type,count) (type *)smb_xmalloc_array(sizeof(type),(count)) -/* The new talloc is paranoid malloc checker safe. */ - -#if 0 - -Disable these now we have checked all code paths and ensured -NULL returns on zero request. JRA. - -#define TALLOC(ctx, size) talloc_zeronull(ctx, size, __location__) -#define TALLOC_P(ctx, type) (type *)talloc_zeronull(ctx, sizeof(type), #type) -#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array_zeronull(ctx, sizeof(type), count, #type) -#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup_zeronull(ctx, ptr, size, __location__) -#define TALLOC_ZERO(ctx, size) _talloc_zero_zeronull(ctx, size, __location__) -#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_zeronull(ctx, sizeof(type), #type) -#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_zeronull(ctx, sizeof(type), count, #type) -#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__) -#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__) - -#else - #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) @@ -247,8 +228,6 @@ NULL returns on zero request. JRA. #define TALLOC_SIZE(ctx, size) talloc_named_const(ctx, size, __location__) #define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__) -#endif - #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) |