diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-01-23 17:29:21 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-01-23 17:29:21 -0800 |
| commit | d629ba480b7cd7344d842069f18fd07f088c4f2f (patch) | |
| tree | 3060a073babfa0933e0106288e7719331b75d28c | |
| parent | 0998d172dbeb5f9d7198bbea9ee9124c0558f41b (diff) | |
| download | samba-d629ba480b7cd7344d842069f18fd07f088c4f2f.tar.gz samba-d629ba480b7cd7344d842069f18fd07f088c4f2f.tar.bz2 samba-d629ba480b7cd7344d842069f18fd07f088c4f2f.zip | |
talloc: Change the two other definitions of TALLOC_FREE to match the primary version
Eventually these two other definitions should be removed and all of
the TALLOC macros should live in the same header. Until then, this
patch eliminates some build warnings.
| -rw-r--r-- | nsswitch/pam_winbind.h | 2 | ||||
| -rw-r--r-- | source3/libaddns/dns.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h index d21fc04a78..0395a1fd5b 100644 --- a/nsswitch/pam_winbind.h +++ b/nsswitch/pam_winbind.h @@ -171,6 +171,6 @@ struct pwb_context { uint32_t ctrl; }; -#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0) +#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type) #define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index 3f95c739d5..42662a224b 100644 --- a/source3/libaddns/dns.h +++ b/source3/libaddns/dns.h @@ -133,7 +133,7 @@ void *talloc_zeronull(const void *context, size_t size, const char *name); #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_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) /******************************************************************* Type definitions for int16, int32, uint16 and uint32. Needed |