Restructure fix and conform to convention

(cherry picked from commit 9f067a158e6741bc14c5dbc25df81e0b2f8630a0)

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index f9a23a08c8e9b23bc22095fac71cc597458a465b..3fd66f30dd6d1534a5a0d756036eddd06d9a2dfb 100644 (file)
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -453,23 +453,22 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
     rr.content=toCanonic(d_zonename, rr.content).toStringRootDot();
     break;
   case QType::AFSDB:
-    try {
-      stringtok(recparts, rr.content);
-      if(recparts.size() == 2)
-      {
+    stringtok(recparts, rr.content);
+    if(recparts.size() == 2) {
+      try {
         recparts[1]=toCanonic(d_zonename, recparts[1]).toStringRootDot();
-      } else {
-        throw PDNSException("AFSDB record for "+rr.qname.toString()+" invalid");
+      } catch (std::exception &e) {
+        throw PDNSException("Error in record '" + rr.qname.toString() + " " + rr.qtype.getName() + "': " + e.what());
       }
-      rr.content.clear();
-      for(string::size_type n = 0; n < recparts.size(); ++n) {
-        if(n)
-          rr.content.append(1,' ');
+    } else {
+      throw PDNSException("AFSDB record for "+rr.qname.toString()+" invalid");
+    }
+    rr.content.clear();
+    for(string::size_type n = 0; n < recparts.size(); ++n) {
+      if(n)
+        rr.content.append(1,' ');
 
-        rr.content+=recparts[n];
-      }
-    } catch (std::exception &e) {
-      throw PDNSException("Error in record '" + rr.qname.toString() + " " + rr.qtype.getName() + "': " + e.what());
+      rr.content+=recparts[n];
     }
     break;
   case QType::SOA: