diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-07 14:43:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-07 12:16:41 +0200 |
| commit | 61543577fa3b7aeaee27800c239f6c78fb74fd26 (patch) | |
| tree | 4017bb12aba213987030f7a2154d3395a969f7a9 | |
| parent | 78c2eca811eb4f4303f46ee88fdbe51e220a6c92 (diff) | |
| download | samba-61543577fa3b7aeaee27800c239f6c78fb74fd26.tar.gz samba-61543577fa3b7aeaee27800c239f6c78fb74fd26.tar.bz2 samba-61543577fa3b7aeaee27800c239f6c78fb74fd26.zip | |
lib/addns: Remove unused TALLOC_ macros
| -rw-r--r-- | lib/addns/dns.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/lib/addns/dns.h b/lib/addns/dns.h index 29f1ed3e99..6ccdbb60f1 100644 --- a/lib/addns/dns.h +++ b/lib/addns/dns.h @@ -95,48 +95,6 @@ #include <talloc.h> -#if 0 - -Disable these now we have checked all code paths and ensured -NULL returns on zero request. JRA. - -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); - -#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) -#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_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) -#ifndef TALLOC_FREE -#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) -#endif - /******************************************************************* Type definitions for int16, int32, uint16 and uint32. Needed for Samba coding style |