From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 25 Jul 2008 20:20:08 +0000 (+0000)
Subject: make arguments parser for configuration file strip trailing spaces and tabs better
X-Git-Tag: rec-3.2~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ff138370e94c1304a75da633ac84f8c417707df;p=pdns

make arguments parser for configuration file strip trailing spaces and tabs better


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1242 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index f67f67116..5b8b62496 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -317,10 +317,7 @@ bool ArgvMap::file(const char *fname, bool lax)
       line=line.substr(0,pos);
 
     // strip trailing spaces
-    trim_right(line);
-    // strip leading spaces
-    if((pos=line.find_first_not_of(" \t\r\n"))!=string::npos)
-      line=line.substr(pos);
+    trim(line);
 
     parseOne(string("--")+line,"",lax);
     line="";