diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 3 | ||||
| -rw-r--r-- | src/util.cpp | 11 | ||||
| -rw-r--r-- | src/util.h | 40 |
3 files changed, 2 insertions, 52 deletions
diff --git a/src/net.cpp b/src/net.cpp index e9ec233a13..37e73c421a 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1093,8 +1093,9 @@ void ThreadDNSAddressSeed2(void* parg) { BOOST_FOREACH(CNetAddr& ip, vaddr) { + int nOneDay = 24*3600; CAddress addr = CAddress(CService(ip, GetDefaultPort())); - addr.nTime = 0; + addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old vAdd.push_back(addr); found++; } diff --git a/src/util.cpp b/src/util.cpp index 1623fe84ef..08752e6930 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -767,17 +767,6 @@ void PrintException(std::exception* pex, const char* pszThread) throw; } -void ThreadOneMessageBox(string strMessage) -{ - // Skip message boxes if one is already open - static bool fMessageBoxOpen; - if (fMessageBoxOpen) - return; - fMessageBoxOpen = true; - ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION); - fMessageBoxOpen = false; -} - void PrintExceptionContinue(std::exception* pex, const char* pszThread) { char pszMessage[10000]; diff --git a/src/util.h b/src/util.h index d5e8a71cd0..a2e1419835 100644 --- a/src/util.h +++ b/src/util.h @@ -85,7 +85,6 @@ T* alignup(T* p) #define strlwr(psz) to_lower(psz) #define _strlwr(psz) to_lower(psz) #define MAX_PATH 1024 -#define Beep(n1,n2) (0) inline void Sleep(int64 n) { /*Boost has a year 2038 problem— if the request sleep time is past epoch+2^31 seconds the sleep returns instantly. @@ -336,25 +335,6 @@ inline std::string HexStr(const std::vector<unsigned char>& vch, bool fSpaces=fa } template<typename T> -std::string HexNumStr(const T itbegin, const T itend, bool f0x=true) -{ - if (itbegin == itend) - return ""; - const unsigned char* pbegin = (const unsigned char*)&itbegin[0]; - const unsigned char* pend = pbegin + (itend - itbegin) * sizeof(itbegin[0]); - std::string str = (f0x ? "0x" : ""); - str.reserve(str.size() + (pend-pbegin) * 2); - for (const unsigned char* p = pend-1; p >= pbegin; p--) - str += strprintf("%02x", *p); - return str; -} - -inline std::string HexNumStr(const std::vector<unsigned char>& vch, bool f0x=true) -{ - return HexNumStr(vch.begin(), vch.end(), f0x); -} - -template<typename T> void PrintHex(const T pbegin, const T pend, const char* pszFormat="%s", bool fSpaces=true) { printf(pszFormat, HexStr(pbegin, pend, fSpaces).c_str()); @@ -475,21 +455,6 @@ bool SoftSetBoolArg(const std::string& strArg, bool fValue); } \ } -#define CATCH_PRINT_EXCEPTION(pszFn) \ - catch (std::exception& e) { \ - PrintException(&e, (pszFn)); \ - } catch (...) { \ - PrintException(NULL, (pszFn)); \ - } - - - - - - - - - template<typename T1> inline uint256 Hash(const T1 pbegin, const T1 pend) @@ -689,11 +654,6 @@ inline void SetThreadPriority(int nPriority) #endif } -inline bool TerminateThread(pthread_t hthread, unsigned int nExitCode) -{ - return (pthread_cancel(hthread) == 0); -} - inline void ExitThread(size_t nExitCode) { pthread_exit((void*)nExitCode); |