zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Noticed when sign-comparison warnings were enabled.
This commit is contained in:
Jeff Garzik 2012-04-15 16:47:24 -04:00 committed by Jeff Garzik
parent 5a701eb7ea
commit ab9dc75a18
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoinrpc.cpp
View File

@ -201,7 +201,7 @@ Value help(const Array& params, bool fHelp)
// Help text is returned in an exception // Help text is returned in an exception
string strHelp = string(e.what()); string strHelp = string(e.what());
if (strCommand == "") if (strCommand == "")
if (strHelp.find('\n') != -1) if (strHelp.find('\n') != string::npos)
strHelp = strHelp.substr(0, strHelp.find('\n')); strHelp = strHelp.substr(0, strHelp.find('\n'));
strRet += strHelp + "\n"; strRet += strHelp + "\n";
} }

8
src/irc.cpp
View File

@ -108,13 +108,13 @@ int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const cha
if (!RecvLineIRC(hSocket, strLine)) if (!RecvLineIRC(hSocket, strLine))
return 0; return 0;
printf("IRC %s\n", strLine.c_str()); printf("IRC %s\n", strLine.c_str());
if (psz1 && strLine.find(psz1) != -1) if (psz1 && strLine.find(psz1) != string::npos)
return 1; return 1;
if (psz2 && strLine.find(psz2) != -1) if (psz2 && strLine.find(psz2) != string::npos)
return 2; return 2;
if (psz3 && strLine.find(psz3) != -1) if (psz3 && strLine.find(psz3) != string::npos)
return 3; return 3;
if (psz4 && strLine.find(psz4) != -1) if (psz4 && strLine.find(psz4) != string::npos)
return 4; return 4;
} }
} }

4
src/net.cpp
View File

@ -162,14 +162,14 @@ bool GetMyExternalIP2(const CService& addrConnect, const char* pszGet, const cha
} }
if (pszKeyword == NULL) if (pszKeyword == NULL)
break; break;
if (strLine.find(pszKeyword) != -1) if (strLine.find(pszKeyword) != string::npos)
{ {
strLine = strLine.substr(strLine.find(pszKeyword) + strlen(pszKeyword)); strLine = strLine.substr(strLine.find(pszKeyword) + strlen(pszKeyword));
break; break;
} }
} }
closesocket(hSocket); closesocket(hSocket);
if (strLine.find("<") != -1) if (strLine.find("<") != string::npos)
strLine = strLine.substr(0, strLine.find("<")); strLine = strLine.substr(0, strLine.find("<"));
strLine = strLine.substr(strspn(strLine.c_str(), " \t\n\r")); strLine = strLine.substr(strspn(strLine.c_str(), " \t\n\r"));
while (strLine.size() > 0 && isspace(strLine[strLine.size()-1])) while (strLine.size() > 0 && isspace(strLine[strLine.size()-1]))