From: Ruben d'Arco <cyclops@prof-x.net>
Date: Mon, 30 Apr 2012 06:24:29 +0000 (+0200)
Subject: Renamed sendline to sendlines with some comment removal.
X-Git-Tag: rec-3.6.0-rc1~550^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e37300dc481f9ba56b265193379fb159a31cd046;p=thirdparty%2Fpdns.git

Renamed sendline to sendlines with some comment removal.
---

diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 2b4929b118..fb820c7422 100755
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -251,7 +251,7 @@ string DynListener::getLine()
   return &mesg[0];
 }
 
-void DynListener::sendLine(const string &l)
+void DynListener::sendlines(const string &l)
 {
   if(d_nonlocal) {
     unsigned int sent=0;
@@ -268,14 +268,13 @@ void DynListener::sendLine(const string &l)
     close(d_client);
   }
   else {
-    string line=l;
-    if(!line.empty() && line[line.length()-1]!='\n')
-      line.append("\n");
-    line.append(1, '\0');
-    line.append(1, '\n');
-    if((unsigned int)write(1,line.c_str(),line.length()) != line.length())
+    string lines=l;
+    if(!lines.empty() && lines[lines.length()-1] != '\n')
+      lines.append("\n");
+    lines.append(1, '\0');
+    lines.append(1, '\n');
+    if((unsigned int)write(1, lines.c_str(), lines.length()) != lines.length())
       L<<Logger::Error<<"Error sending data to console: "<<stringerror()<<endl;
-      
   }
 }
 
@@ -302,21 +301,19 @@ void DynListener::theListener()
       vector<string>parts;
       stringtok(parts,line," ");
       if(parts.empty()) {
-        sendLine("Empty line");
+        sendlines("Empty line");
         continue;
       }
 
       parts[0] = toUpper( parts[0] );
-      if(s_funcdb.count(parts[0])) {
-        cerr<<parts[0]<<" found in s_funcdb"<<endl;
-        sendLine((*(s_funcdb[parts[0]].func))(parts,d_ppid));
-      } else if (parts[0] == "HELP") {
-        sendLine(getHelp());
-      }else if(s_restfunc) {
-        cerr<<"Calling restfunction."<<endl;
-        sendLine((*s_restfunc)(parts,d_ppid));
-      } else
-        sendLine("Unknown command: '"+parts[0]+"'");
+      if(s_funcdb.count(parts[0])) 
+        sendlines((*(s_funcdb[parts[0]].func))(parts,d_ppid));
+      else if (parts[0] == "HELP")
+        sendlines(getHelp());
+      else if(s_restfunc)
+        sendlines((*s_restfunc)(parts,d_ppid));
+      else
+        sendlines("Unknown command: '"+parts[0]+"'");
     }
   }
   catch(AhuException &AE)
diff --git a/pdns/dynlistener.hh b/pdns/dynlistener.hh
old mode 100644
new mode 100755
index 769aa470d7..c349f18bd9
--- a/pdns/dynlistener.hh
+++ b/pdns/dynlistener.hh
@@ -57,7 +57,7 @@ public:
   static void registerRestFunc(g_funk_t *gf);
   static g_funk_t* getFunc(const string& fname) { return s_funcdb[fname].func; } 
 private:
-  void sendLine(const string &line);
+  void sendlines(const string &lines);
   string getHelp();
   string getLine();
 
diff --git a/pdns/win32_dynlistener.cc b/pdns/win32_dynlistener.cc
old mode 100644
new mode 100755
index 4222f03662..5d1d4a0f9d
--- a/pdns/win32_dynlistener.cc
+++ b/pdns/win32_dynlistener.cc
@@ -109,7 +109,7 @@ string DynListener::getLine()
   return mesg;
 }
 
-void DynListener::sendLine(const string &l)
+void DynListener::sendlines(const string &l)
 {
   unsigned long bytesWritten;
 
@@ -145,19 +145,19 @@ void DynListener::theListener()
       vector<string>parts;
       stringtok(parts,line," ");
       if(parts.empty()) {
-        sendLine("Empty line");
+        sendlines("Empty line");
         continue;
       }
       parts[0] = toUpper( parts[0] ); 
       if(!d_funcdb[parts[0]]) {
         if(d_restfunc) 
-          sendLine((*d_restfunc)(parts,d_ppid));
+          sendlines((*d_restfunc)(parts,d_ppid));
         else
-          sendLine("Unknown command: '"+parts[0]+"'");
+          sendlines("Unknown command: '"+parts[0]+"'");
         continue;
       }
 
-      sendLine((*d_funcdb[parts[0]])(parts,d_ppid));
+      sendlines((*d_funcdb[parts[0]])(parts,d_ppid));
     }
   }
   catch(AhuException &AE)