From: Tim Prouty <tprouty@samba.org>
Date: Sat, 24 Jan 2009 01:29:21 +0000 (-0800)
Subject: talloc: Change the two other definitions of TALLOC_FREE to match the primary version
X-Git-Tag: samba-4.0.0alpha7~422^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d629ba480b7cd7344d842069f18fd07f088c4f2f;p=thirdparty%2Fsamba.git

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.
---

diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h
index d21fc04a78a..0395a1fd5b9 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 3f95c739d51..42662a224b0 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