From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 22 Jul 2014 16:30:13 +0000 (+0200)
Subject: libdane: simplified initialization of variables.
X-Git-Tag: gnutls_3_3_6~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e43d2183d3be756f24df22e8fbc4fe2d816024d;p=thirdparty%2Fgnutls.git

libdane: simplified initialization of variables.
---

diff --git a/libdane/dane.c b/libdane/dane.c
index ad9af867e2..8c8ab35f44 100644
--- a/libdane/dane.c
+++ b/libdane/dane.c
@@ -164,26 +164,21 @@ dane_query_to_raw_tlsa(dane_query_t q, unsigned int *data_entries,
 	unsigned int idx;
 
 	*data_entries = 0;
-	if (bogus)
-		*bogus = 0;
-	if (secure)
-		*secure = 0;
 	*dane_data = NULL;
 	*dane_data_len = NULL;
 
-	switch (q->status) {
-	case DANE_QUERY_DNSSEC_VERIFIED:
-		if (secure)
+	if (secure) {
+		if (q->status & DANE_QUERY_DNSSEC_VERIFIED)
 			*secure = 1;
-		break;
+		else
+			*secure = 0;
+	}
 
-	case DANE_QUERY_BOGUS:
-		if (bogus)
+	if (bogus) {
+		if (q->status & DANE_QUERY_BOGUS)
 			*bogus = 1;
-		break;
-
-	default:
-		break;
+		else
+			*bogus = 0;
 	}
 
 	/* pack dane_data pointer list followed by dane_data contents */