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/irc.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/irc.cpp')
| -rw-r--r-- | src/irc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; } } |