diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-04-15 16:47:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-04-15 16:47:24 -0400 |
| commit | ab9dc75a183c7a46e38e957ee3192d5febcccb3c (patch) | |
| tree | 4af4074d5ef5859ce780af39f483cb02f5da5da2 | |
| parent | 5a701eb7ea16b87b56263996ee8e98ec89e2a3d8 (diff) | |
| download | bitcoin-ab9dc75a183c7a46e38e957ee3192d5febcccb3c.tar.xz | |
The string class returns string::npos, when find() fails.
Noticed when sign-comparison warnings were enabled.
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 | ||||
| -rw-r--r-- | src/irc.cpp | 8 | ||||
| -rw-r--r-- | src/net.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 63c51ada8d..f0d27fad99 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -201,7 +201,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"; } diff --git a/src/irc.cpp b/src/irc.cpp index 09bacc1658..d535f59c4c 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -108,13 +108,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 b0f365061c..fb88891ad2 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -162,14 +162,14 @@ bool GetMyExternalIP2(const CService& 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])) |