From: Matthijs Mekking <github@pletterpet.nl>
Date: Mon, 20 Jan 2014 11:17:14 +0000 (+0100)
Subject: revert, and handle exceptions first
X-Git-Tag: release-1.7.0-rc1~183^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d604111765694b028daed7b020226dfd1b4ca5;p=thirdparty%2Fldns.git

revert, and handle exceptions first
---

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);
 }
diff --git a/rr.c b/rr.c
index d4e069d2..cfee170e 100644
--- a/rr.c
+++ b/rr.c
@@ -2373,15 +2373,15 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 	{LDNS_RR_TYPE_TSIG, "TSIG", 7, 7, type_tsig_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 1 },
 
 	/* IXFR: A request for a transfer of an incremental zone transfer */
-{LDNS_RR_TYPE_NULL, "IXFR", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NULL, "TYPE251", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 	/* AXFR: A request for a transfer of an entire zone */
-{LDNS_RR_TYPE_NULL, "AXFR", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NULL, "TYPE252", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 	/* MAILB: A request for mailbox-related records (MB, MG or MR) */
-{LDNS_RR_TYPE_NULL, "MAILB", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NULL, "TYPE253", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 	/* MAILA: A request for mail agent RRs (Obsolete - see MX) */
-{LDNS_RR_TYPE_NULL, "MAILA", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NULL, "TYPE254", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 	/* ANY: A request for all (available) records */
-{LDNS_RR_TYPE_NULL, "ANY", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NULL, "TYPE255", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 
 #ifdef RRTYPE_URI
 	/* 256 */