diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:07:24 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:07:24 -0400 |
| commit | 66116c3847eeb3f0619bc084d96f5add41a156c8 (patch) | |
| tree | 8952b665662e18fd4a1b6ffd5f99a39adab8d92d /src/net.cpp | |
| parent | c43a9ea77db06b9d101f0551df373d417e5028af (diff) | |
| parent | a93ab877877925c60b2dbf56bdde8aa46b6b7391 (diff) | |
| download | bitcoin-66116c3847eeb3f0619bc084d96f5add41a156c8.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/util.cpp
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index c4bd027de2..5368261243 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -159,14 +159,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])) |