From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 20 Jan 2014 15:24:22 +0000 (+0100)
Subject: merge develop into my develop, because of git.
X-Git-Tag: release-1.7.0-rc1~183^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e8ee8817d90d521ac4670b79c5071890a6da57;p=thirdparty%2Fldns.git

merge develop into my develop, because of git.
---

diff --git a/host2str.c b/host2str.c
index e2c936ba..4a335dba 100644
--- a/host2str.c
+++ b/host2str.c
@@ -598,29 +598,28 @@ ldns_rr_type2buffer_str(ldns_buffer *output, const ldns_rr_type type)
 
 	descriptor = ldns_rr_descript(type);
 
-	if (descriptor && descriptor->_name) {
-		ldns_buffer_printf(output, "%s", descriptor->_name);
-	} else {
-		/* exceptions for pseudotypes */
-		switch (type) {
-			case LDNS_RR_TYPE_IXFR:
-				ldns_buffer_printf(output, "IXFR");
-				break;
-			case LDNS_RR_TYPE_AXFR:
-				ldns_buffer_printf(output, "AXFR");
-				break;
-			case LDNS_RR_TYPE_MAILA:
-				ldns_buffer_printf(output, "MAILA");
-				break;
-			case LDNS_RR_TYPE_MAILB:
-				ldns_buffer_printf(output, "MAILB");
-				break;
-			case LDNS_RR_TYPE_ANY:
-				ldns_buffer_printf(output, "ANY");
-				break;
-			default:
+	switch (type) {
+		case LDNS_RR_TYPE_IXFR:
+			ldns_buffer_printf(output, "IXFR");
+			break;
+		case LDNS_RR_TYPE_AXFR:
+			ldns_buffer_printf(output, "AXFR");
+			break;
+		case LDNS_RR_TYPE_MAILA:
+			ldns_buffer_printf(output, "MAILA");
+			break;
+		case LDNS_RR_TYPE_MAILB:
+			ldns_buffer_printf(output, "MAILB");
+			break;
+		case LDNS_RR_TYPE_ANY:
+			ldns_buffer_printf(output, "ANY");
+			break;
+		default:
+			if (descriptor && descriptor->_name) {
+				ldns_buffer_printf(output, "%s", descriptor->_name);
+			} else {
 				ldns_buffer_printf(output, "TYPE%u", type);
-		}
+			}
 	}
 	return ldns_buffer_status(output);
 }