Changeset 1235

Timestamp:

07/17/08 22:34:46 (20 months ago)

Author:

ahu

Message:

improve error messages generated by the zoneparser-tng

Location:

trunk/pdns/pdns

Files:

• zoneparser-tng.cc (modified) (5 diffs)
• zoneparser-tng.hh (modified) (1 diff)

trunk/pdns/pdns/zoneparser-tng.cc

@@ -101 +101 @@
 
     default:
-      throw ZoneParserTNG::exception("Unable to parse time specification '"+str+"' on line "+
-                                     lexical_cast<string>(d_filestates.top().d_lineno)+" of file '"+
-                                     d_filestates.top().d_filename+"'");
+      throw ZoneParserTNG::exception("Unable to parse time specification '"+str+"' "+getLineOfFile());
     }
   return val;
@@ -219 +217 @@
 }
 
-
+string ZoneParserTNG::getLineOfFile()
+{
+  return "on line "+lexical_cast<string>(d_filestates.top().d_lineno)+" of file '"+d_filestates.top().d_filename+"'";
+}
 
 bool ZoneParserTNG::get(DNSResourceRecord& rr) 
@@ -265 +266 @@
     }
     else
-      throw exception("Can't parse zone line '"+d_line+"' on line "+lexical_cast<string>(d_filestates.top().d_lineno)+
-                      " of file '"+d_filestates.top().d_filename);
+      throw exception("Can't parse zone line '"+d_line+"' "+getLineOfFile());
     goto retry;
   }
@@ -287 +287 @@
 
   if(parts.empty()) 
-    throw exception("Line with too little parts");
+    throw exception("Line with too little parts "+getLineOfFile());
 
   string nextpart;
@@ -327 +327 @@
     }
     catch(...) {
-      throw runtime_error("Parsing zone content on line "+
-                          lexical_cast<string>(d_filestates.top().d_lineno)+
-                          " of file '"+d_filestates.top().d_filename+"': '"+nextpart+
+      throw runtime_error("Parsing zone content "+getLineOfFile()+
+                          ": '"+nextpart+
                           "' doesn't look like a qtype, stopping loop");
     }
   }
   if(!haveQTYPE) 
-    throw exception("Malformed line "+lexical_cast<string>(d_filestates.top().d_lineno)+" of '"+d_filestates.top().d_filename+"': "+d_line+"'");
+    throw exception("Malformed line "+getLineOfFile()+": '"+d_line+"'");
 
   rr.content=d_line.substr(range.first);

trunk/pdns/pdns/zoneparser-tng.hh

@@ -41 +41 @@
   void stackFile(const std::string& fname);
   unsigned makeTTLFromZone(const std::string& str);
+  string getLineOfFile();
   string d_reldir;
   string d_line;