From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Mon, 1 Nov 2010 14:46:34 +0000 (+0000)
Subject: if statements are redundant
X-Git-Tag: release-1.6.7~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3b73126e665e3964c360bee8e05d563cf8831d;p=thirdparty%2Fldns.git

if statements are redundant
---

diff --git a/resolver.c b/resolver.c
index d950e50d..db238c37 100644
--- a/resolver.c
+++ b/resolver.c
@@ -542,27 +542,21 @@ ldns_resolver_push_searchlist(ldns_resolver *r, ldns_rdf *d)
 void
 ldns_resolver_set_tsig_keyname(ldns_resolver *r, char *tsig_keyname)
 {
-	if (r && r->_tsig_keyname) {
-		LDNS_FREE(r->_tsig_keyname);
-	}
+	LDNS_FREE(r->_tsig_keyname);
 	r->_tsig_keyname = strdup(tsig_keyname);
 }
 
 void
 ldns_resolver_set_tsig_algorithm(ldns_resolver *r, char *tsig_algorithm)
 {
-	if (r && r->_tsig_algorithm) {
-		LDNS_FREE(r->_tsig_algorithm);
-	}
+	LDNS_FREE(r->_tsig_algorithm);
 	r->_tsig_algorithm = strdup(tsig_algorithm);
 }
 
 void
 ldns_resolver_set_tsig_keydata(ldns_resolver *r, char *tsig_keydata)
 {
-	if (r && r->_tsig_keydata) {
-		LDNS_FREE(r->_tsig_keydata);
-	}
+	LDNS_FREE(r->_tsig_keydata);
 	r->_tsig_keydata = strdup(tsig_keydata);
 }