From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 15 Apr 2012 20:47:24 +0000 (-0400)
Subject: The string class returns string::npos, when find() fails.
X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~2^2^2~26
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=ef2f3ddaf764f886fbb4d6004844fe88b8029cf2

The string class returns string::npos, when find() fails.

Noticed when sign-comparison warnings were enabled.
---

diff --git a/src/irc.cpp b/src/irc.cpp
index 5dfab06..5ac2306 100644
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -156,13 +156,13 @@ int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const cha
         if (!RecvLineIRC(hSocket, strLine))
             return 0;
         printf("IRC %s\n", strLine.c_str());
-        if (psz1 && strLine.find(psz1) != -1)
+        if (psz1 && strLine.find(psz1) != string::npos)
             return 1;
-        if (psz2 && strLine.find(psz2) != -1)
+        if (psz2 && strLine.find(psz2) != string::npos)
             return 2;
-        if (psz3 && strLine.find(psz3) != -1)
+        if (psz3 && strLine.find(psz3) != string::npos)
             return 3;
-        if (psz4 && strLine.find(psz4) != -1)
+        if (psz4 && strLine.find(psz4) != string::npos)
             return 4;
     }
 }
diff --git a/src/net.cpp b/src/net.cpp
index 763e160..38fd3b5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -316,14 +316,14 @@ bool GetMyExternalIP2(const CAddress& addrConnect, const char* pszGet, const cha
                 }
                 if (pszKeyword == NULL)
                     break;
-                if (strLine.find(pszKeyword) != -1)
+                if (strLine.find(pszKeyword) != string::npos)
                 {
                     strLine = strLine.substr(strLine.find(pszKeyword) + strlen(pszKeyword));
                     break;
                 }
             }
             closesocket(hSocket);
-            if (strLine.find("<") != -1)
+            if (strLine.find("<") != string::npos)
                 strLine = strLine.substr(0, strLine.find("<"));
             strLine = strLine.substr(strspn(strLine.c_str(), " \t\n\r"));
             while (strLine.size() > 0 && isspace(strLine[strLine.size()-1]))
diff --git a/src/rpc.cpp b/src/rpc.cpp
index bbfea33..8a02d95 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -147,7 +147,7 @@ Value help(const Array& params, bool fHelp)
             // Help text is returned in an exception
             string strHelp = string(e.what());
             if (strCommand == "")
-                if (strHelp.find('\n') != -1)
+                if (strHelp.find('\n') != string::npos)
                     strHelp = strHelp.substr(0, strHelp.find('\n'));
             strRet += strHelp + "\n";
         }