Mercurial > hg > bitcoin
changeset 2927:6d1897505a0f draft
The string class returns string::npos, when find() fails.
Noticed when sign-comparison warnings were enabled.
| author | Jeff Garzik <jeff@garzik.org> |
|---|---|
| date | Sun, 15 Apr 2012 16:47:24 -0400 |
| parents | eebe6cd0e3bd |
| children | 5b48ee639ec8 |
| files | src/irc.cpp src/net.cpp src/rpc.cpp |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/irc.cpp +++ b/src/irc.cpp @@ -156,13 +156,13 @@ 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; } }
--- a/src/net.cpp +++ b/src/net.cpp @@ -316,14 +316,14 @@ } 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]))
--- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -147,7 +147,7 @@ // 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"; }