X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Firc.cpp;h=a29874ebfbdafd3111b3bc407013f75986ee322f;hp=57e7d88f50e821e6ee7b426bf42b0d6b0bd049d5;hb=1c1980bccd1bcccdb03c69ebbe03ad51e08f343a;hpb=cd7e570c1f74a1f1ab1590ecbb09bd3bfcb363ea diff --git a/src/irc.cpp b/src/irc.cpp index 57e7d88..a29874e 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -7,10 +7,7 @@ #include "base58.h" #include "net.h" -#include // for startswith() and endswith() - using namespace std; -using namespace boost; int nGotIRCAddresses = 0; @@ -78,7 +75,7 @@ static bool Send(SOCKET hSocket, const char* pszSend) bool RecvLineIRC(SOCKET hSocket, string& strLine) { - while (true) + for ( ; ; ) { bool fRet = RecvLine(hSocket, strLine); if (fRet) @@ -101,7 +98,7 @@ bool RecvLineIRC(SOCKET hSocket, string& strLine) int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const char* psz3=NULL, const char* psz4=NULL) { - while (true) + for ( ; ; ) { string strLine; strLine.reserve(10000); @@ -136,7 +133,7 @@ bool Wait(int nSeconds) bool RecvCodeLine(SOCKET hSocket, const char* psz1, string& strRet) { strRet.clear(); - while (true) + for ( ; ; ) { string strLine; if (!RecvLineIRC(hSocket, strLine)) @@ -263,7 +260,7 @@ void ThreadIRCSeed2(void* parg) // or if it keeps failing because the nick is already in use. if (!fNoListen && GetLocal(addrLocal, &addrIPv4) && nNameRetry<3) strMyName = EncodeAddress(GetLocalAddress(&addrConnect)); - if (strMyName == "") + if (strMyName.empty()) strMyName = strprintf("x%" PRIu64 "", GetRand(1000000000)); Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str()); @@ -336,7 +333,7 @@ void ThreadIRCSeed2(void* parg) { // index 7 is limited to 16 characters // could get full length name at index 10, but would be different from join messages - strName = vWords[7].c_str(); + strName = vWords[7]; printf("IRC got who\n"); } @@ -347,7 +344,7 @@ void ThreadIRCSeed2(void* parg) printf("IRC got join\n"); } - if (boost::algorithm::starts_with(strName, "u")) + if (strName.compare(0,1, "u") == 0) { CAddress addr; if (DecodeAddress(strName, addr))