From a350fc7a0a6da79b1a9fcff54d18ce60dd10bfec Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 19 Jul 2017 16:10:09 +0200
Subject: [PATCH] Clartify how we check the return value of std::string::find()

Making Coverity happier.
---
 pdns/arguments.cc        | 10 +++++-----
 pdns/secpoll-auth.cc     |  2 +-
 pdns/secpoll-recursor.cc |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 10c522ab7..935c9eae7 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -120,7 +120,7 @@ string ArgvMap::helpstring(string prefix)
       i!=helpmap.end();
       i++)
     {
-      if(!prefix.empty() && i->first.find(prefix)) // only print items with prefix
+      if(!prefix.empty() && i->first.find(prefix) != 0) // only print items with prefix
         continue;
 
       help+="  --";
@@ -304,18 +304,18 @@ void ArgvMap::parseOne(const string &arg, const string &parseOnly, bool lax)
   string::size_type pos;
   bool incremental = false;
 
-  if(!arg.find("--") && (pos=arg.find("+="))!=string::npos) // this is a --port+=25 case
+  if(arg.find("--") == 0 && (pos=arg.find("+="))!=string::npos) // this is a --port+=25 case
   {
     var=arg.substr(2,pos-2);
     val=arg.substr(pos+2);
     incremental = true;
   }
-  else if(!arg.find("--") && (pos=arg.find("="))!=string::npos)  // this is a --port=25 case
+  else if(arg.find("--") == 0 && (pos=arg.find("="))!=string::npos)  // this is a --port=25 case
   {
     var=arg.substr(2,pos-2);
     val=arg.substr(pos+1);
   }
-  else if(!arg.find("--") && (arg.find("=")==string::npos))  // this is a --daemon case
+  else if(arg.find("--") == 0 && (arg.find("=")==string::npos))  // this is a --daemon case
   {
     var=arg.substr(2);
     val="";
@@ -376,7 +376,7 @@ void ArgvMap::preParse(int &argc, char **argv, const string &arg)
 {
   for(int n=1;n<argc;n++) {
     string varval=argv[n];
-    if(!varval.find("--"+arg))
+    if(varval.find("--"+arg) == 0)
       parseOne(argv[n]);
   }
 }
diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 2178a2d14..89eebdc34 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -62,7 +62,7 @@ void doSecPoll(bool first)
   }
   else {
     string pkgv(PACKAGEVERSION);
-    if(pkgv.find("0.0."))
+    if(pkgv.find("0.0.") != 0)
       L<<Logger::Warning<<"Could not retrieve security status update for '" + pkgv + "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
     else
       L<<Logger::Warning<<"Not validating response for security status update, this is a non-release version."<<endl;
diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index 872e641c3..25d14187b 100644
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -67,7 +67,7 @@ void doSecPoll(time_t* last_secpoll)
     *last_secpoll=now.tv_sec;
   }
   else {
-    if(pkgv.find("0.0."))
+    if(pkgv.find("0.0.") != 0)
       L<<Logger::Warning<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', RCODE = "<< RCode::to_s(res)<<endl;
     else
       L<<Logger::Warning<<"Ignoring response for security status update, this is a non-release version."<<endl;
-- 
2.40.0