From 16ce7f1878aecbc83c443ccae844b869a0e27e37 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:09:57 -0400
Subject: [PATCH] Enforce style const MOADNSException &mde

There were a number of styles for this exception object.
This enforces a single style (const, space before &).
---
 pdns/dnsdemog.cc          | 2 +-
 pdns/dnsgram.cc           | 2 +-
 pdns/dnsreplay.cc         | 6 +++---
 pdns/dnsscan.cc           | 4 ++--
 pdns/dnsscope.cc          | 2 +-
 pdns/ixfrdist.cc          | 4 ++--
 pdns/pdns_recursor.cc     | 8 ++++----
 pdns/slavecommunicator.cc | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index 7abcefbdc0..cc9cc2b494 100644
--- a/pdns/dnsdemog.cc
+++ b/pdns/dnsdemog.cc
@@ -81,7 +81,7 @@ try
           cout <<", "<< ntohs(dh->arcount) <<");\n";
 
         }
-        catch(MOADNSException& mde) {
+        catch(const MOADNSException &mde) {
           //        cerr<<"error parsing packet: "<<mde.what()<<endl;
           continue;
         }
diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc
index 17a5f990bd..34fd0ca1d2 100644
--- a/pdns/dnsgram.cc
+++ b/pdns/dnsgram.cc
@@ -194,7 +194,7 @@ try
             lastreport = pr.d_pheader.ts;
           }          
         }
-        catch(MOADNSException& mde) {
+        catch(const MOADNSException &mde) {
           //        cerr<<"error parsing packet: "<<mde.what()<<endl;
           parseErrors++;
           continue;
diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc
index 789180f63a..aa0f4e1c59 100644
--- a/pdns/dnsreplay.cc
+++ b/pdns/dnsreplay.cc
@@ -444,7 +444,7 @@ try
 	measureResultAndClean(iter);
       }
     }
-    catch(MOADNSException &e)
+    catch(const MOADNSException &mde)
     {
       s_wednserrors++;
     }
@@ -684,10 +684,10 @@ static bool sendPacketFromPR(PcapPacketReader& pr, const ComboAddress& remote, i
       }
     }
   }
-  catch(MOADNSException &e)
+  catch(const MOADNSException &mde)
   {
     if(!g_quiet)
-      cerr<<"Error parsing packet: "<<e.what()<<endl;
+      cerr<<"Error parsing packet: "<<mde.what()<<endl;
     s_idmanager.releaseID(qd.d_assignedID);  // not added to qids for cleanup
     s_origdnserrors++;
   }
diff --git a/pdns/dnsscan.cc b/pdns/dnsscan.cc
index 703d9314d5..936a05dd93 100644
--- a/pdns/dnsscan.cc
+++ b/pdns/dnsscan.cc
@@ -90,8 +90,8 @@ try
           counts[mdp.d_qtype]++;
 
       }
-      catch(MOADNSException &e) {
-        cout<<"Error from remote "<<pr.getSource().toString()<<": "<<e.what()<<"\n";
+      catch(const MOADNSException &mde) {
+        cout<<"Error from remote "<<pr.getSource().toString()<<": "<<mde.what()<<"\n";
         //        sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
       }
     }
diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index 7627b973d5..42b9bb0027 100644
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -321,7 +321,7 @@ try
 
         
 	}
-	catch(MOADNSException& mde) {
+	catch(const MOADNSException &mde) {
 	  if(verbose)
 	    cout<<"error parsing packet: "<<mde.what()<<endl;
 	  if(pw)
diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index 8645e09114..930a8c67be 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -854,8 +854,8 @@ static void tcpWorker(int tid) {
       } /* if (mdp.d_qtype == QType::IXFR) */
 
       shutdown(cfd, 2);
-    } catch (MOADNSException &e) {
-      g_log<<Logger::Warning<<prefix<<"Could not parse DNS packet from "<<saddr.toStringWithPort()<<": "<<e.what()<<endl;
+    } catch (const MOADNSException &mde) {
+      g_log<<Logger::Warning<<prefix<<"Could not parse DNS packet from "<<saddr.toStringWithPort()<<": "<<mde.what()<<endl;
     } catch (runtime_error &e) {
       g_log<<Logger::Warning<<prefix<<"Could not write reply to "<<saddr.toStringWithPort()<<": "<<e.what()<<endl;
     }
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 9444cdb2f2..aa7760136c 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1570,8 +1570,8 @@ static void startDoResolve(void *p)
     g_log<<Logger::Error<<"startDoResolve problem "<<makeLoginfo(dc)<<": "<<ae.reason<<endl;
     delete dc;
   }
-  catch(MOADNSException& e) {
-    g_log<<Logger::Error<<"DNS parser error "<<makeLoginfo(dc) <<": "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
+  catch(const MOADNSException &mde) {
+    g_log<<Logger::Error<<"DNS parser error "<<makeLoginfo(dc) <<": "<<dc->d_mdp.d_qname<<", "<<mde.what()<<endl;
     delete dc;
   }
   catch(std::exception& e) {
@@ -1747,7 +1747,7 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var)
       try {
         dc=new DNSComboWriter(conn->data, g_now);
       }
-      catch(MOADNSException &mde) {
+      catch(const MOADNSException &mde) {
         g_stats.clientParseError++;
         if(g_logCommonErrors)
           g_log<<Logger::Error<<"Unable to parse packet from TCP client "<< conn->d_remote.toStringWithPort() <<endl;
@@ -2255,7 +2255,7 @@ static void handleNewUDPQuestion(int fd, FDMultiplexer::funcparam_t& var)
           }
         }
       }
-      catch(const MOADNSException& mde) {
+      catch(const MOADNSException &mde) {
         g_stats.clientParseError++;
         if(g_logCommonErrors) {
           g_log<<Logger::Error<<"Unable to parse packet from remote UDP client "<<fromaddr.toString() <<": "<<mde.what()<<endl;
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index face51a097..7a55fc0515 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -600,8 +600,8 @@ void CommunicatorClass::suck(const DNSName &domain, const ComboAddress& remote)
       di.backend->abortTransaction();
     }
   }
-  catch(MOADNSException &re) {
-    g_log<<Logger::Error<<"Unable to parse record during incoming AXFR of '"<<domain<<"' (MOADNSException): "<<re.what()<<endl;
+  catch(const MOADNSException &mde) {
+    g_log<<Logger::Error<<"Unable to parse record during incoming AXFR of '"<<domain<<"' (MOADNSException): "<<mde.what()<<endl;
     if(di.backend && transaction) {
       g_log<<Logger::Error<<"Aborting possible open transaction for domain '"<<domain<<"' AXFR"<<endl;
       di.backend->abortTransaction();
-- 
2.47.2