Changeset 1276

Timestamp:

11/15/08 21:40:26 (16 months ago)

Author:

ahu

Message:

third batch of std::exception

Location:

trunk/pdns/pdns

Files:

• backends/bind/bindbackend2.cc (modified) (2 diffs)
• backends/bind/zone2sql.cc (modified) (2 diffs)
• dnspacket.cc (modified) (2 diffs)
• dnsscope.cc (modified) (2 diffs)
• dynlistener.cc (modified) (1 diff)
• packethandler.cc (modified) (1 diff)
• pdns_recursor.cc (modified) (1 diff)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -604 +604 @@
             rejected++;
           }
-          catch(exception &ae) {
+          catch(std::exception &ae) {
             ostringstream msg;
             msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
@@ -719 +719 @@
     bbd->d_status=msg.str();
   }
-  catch(exception &ae) {
+  catch(std::exception &ae) {
     ostringstream msg;
     msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.what();

trunk/pdns/pdns/backends/bind/zone2sql.cc

@@ -288 +288 @@
             num_domainsdone++;
           }
-          catch(exception &ae) {
+          catch(std::exception &ae) {
             if(!::arg().mustDo("on-error-resume-next"))
               throw;
@@ -323 +323 @@
     return 0;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     cerr<<"died because of STL error: "<<e.what()<<endl;
     exit(0);

trunk/pdns/pdns/dnspacket.cc

@@ -344 +344 @@
       pw.commit();
     }
-    catch(exception& e) {
+    catch(std::exception& e) {
       L<<Logger::Error<<"Exception: "<<e.what()<<endl;
       throw;
@@ -478 +478 @@
   return 0;
 }
-catch(exception& e) {
+catch(std::exception& e) {
   return -1;
 }

trunk/pdns/pdns/dnsscope.cc

@@ -115 +115 @@
         continue;
       }
-      catch(exception& e) {
+      catch(std::exception& e) {
         if(pw)
           pw->write();
@@ -212 +212 @@
     cerr<<"Average response time: "<<tottime/totpackets<<" usec"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

trunk/pdns/pdns/dynlistener.cc

@@ -312 +312 @@
       L<<Logger::Error<<"Fatal error 2 in control listener: "<<E<<endl;
     }
-  catch(exception& e)
+  catch(std::exception& e)
     {
       L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;

trunk/pdns/pdns/packethandler.cc

@@ -940 +940 @@
     S.ringAccount("servfail-queries",p->qdomain);
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Exception building answer packet ("<<e.what()<<") sending out servfail"<<endl;
     delete r;

trunk/pdns/pdns/pdns_recursor.cc

@@ -881 +881 @@
            questionExpand(data, len, qname, sizeof(qname), type);  
         }
-        catch(exception &e)
+        catch(std::exception &e)
         {
            throw MOADNSException(e.what());