X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.cpp;h=76eb8a5755512f6f67419de4d0637f58e2a9b740;hb=47d3ceb3da845e216fc9577cbf52f8b5600e5f93;hp=0f84938e68dde29e0c7344f583f7e8e231987eeb;hpb=a303a6ee32ebc04eb261db780f1e968f58d6e260;p=novacoin.git diff --git a/src/util.cpp b/src/util.cpp index 0f84938..76eb8a5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6,21 +6,10 @@ #include "util.h" #include "sync.h" #include "version.h" -#include "ui_interface.h" +#include "interface.h" #include #include // for to_lower() #include // for startswith() and endswith() - -// Work around clang compilation problem in Boost 1.46: -// /usr/include/boost/program_options/detail/config_file.hpp:163:17: error: call to function 'to_internal' that is neither visible in the template definition nor found by argument-dependent lookup -// See also: http://stackoverflow.com/questions/10020179/compilation-fail-in-boost-librairies-program-options -// http://clang.debian.net/status.php?version=3.0&key=CANNOT_FIND_FUNCTION -namespace boost { - namespace program_options { - std::string to_internal(const std::string&); - } -} - #include #include #include @@ -31,27 +20,8 @@ namespace boost { #include #include #include -#include #ifdef WIN32 -#ifdef _MSC_VER -#pragma warning(disable:4786) -#pragma warning(disable:4804) -#pragma warning(disable:4805) -#pragma warning(disable:4717) -#endif -#ifdef _WIN32_WINNT -#undef _WIN32_WINNT -#endif -#define _WIN32_WINNT 0x0501 -#ifdef _WIN32_IE -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0501 -#define WIN32_LEAN_AND_MEAN 1 -#ifndef NOMINMAX -#define NOMINMAX -#endif #include /* for _commit */ #include "shlobj.h" #elif defined(__linux__) @@ -128,13 +98,6 @@ public: ppmutexOpenSSL[i] = new CCriticalSection(); CRYPTO_set_locking_callback(locking_callback); - // OpenSSL can optionally load a config file which lists optional loadable modules and engines. - // We don't use them so we don't require the config. However some of our libs may call functions - // which attempt to load the config file, possibly resulting in an exit() or crash if it is missing - // or corrupt. Explicitly tell OpenSSL not to try to load the file. The result for our libs will be - // that the config appears to have been loaded and there are no modules/engines available. - OPENSSL_no_config(); - #ifdef WIN32 // Seed random number generator with screen scrape and other hardware sources RAND_screen(); @@ -320,7 +283,7 @@ string vstrprintf(const char *format, va_list ap) char* p = buffer; int limit = sizeof(buffer); int ret; - while (true) + for ( ; ; ) { #ifndef _MSC_VER va_list arg_ptr; @@ -384,7 +347,7 @@ void ParseString(const string& str, char c, vector& v) return; string::size_type i1 = 0; string::size_type i2; - while (true) + for ( ; ; ) { i2 = str.find(c, i1); if (i2 == str.npos) @@ -408,16 +371,16 @@ string FormatMoney(int64_t n, bool fPlus) string str = strprintf("%" PRId64 ".%06" PRId64, quotient, remainder); // Right-trim excess zeros before the decimal point: - int nTrim = 0; + size_t nTrim = 0; for (size_t i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) ++nTrim; if (nTrim) str.erase(str.size()-nTrim, nTrim); if (n < 0) - str.insert((unsigned int)0, 1, '-'); + str.insert(0u, 1, '-'); else if (fPlus && n > 0) - str.insert((unsigned int)0, 1, '+'); + str.insert(0u, 1, '+'); return str; } @@ -500,7 +463,7 @@ vector ParseHex(const char* psz) { // convert hex dump to vector vector vch; - while (true) + for ( ; ; ) { while (isspace(*psz)) psz++; @@ -719,7 +682,7 @@ vector DecodeBase64(const char* p, bool* pfInvalid) int mode = 0; int left = 0; - while (1) + for ( ; ; ) { int dec = decode64_table[(unsigned char)*p]; if (dec == -1) break; @@ -872,7 +835,7 @@ vector DecodeBase32(const char* p, bool* pfInvalid) int mode = 0; int left = 0; - while (1) + for ( ; ; ) { int dec = decode32_table[(unsigned char)*p]; if (dec == -1) break; @@ -1015,7 +978,7 @@ std::string DecodeDumpString(const std::string &str) { bool WildcardMatch(const char* psz, const char* mask) { - while (true) + for ( ; ; ) { switch (*mask) { @@ -1118,7 +1081,7 @@ boost::filesystem::path GetDefaultDataDir() pathRet = fs::path("/"); else pathRet = fs::path(pszHome); -#ifdef MAC_OSX +#ifdef __APPLE__ // Mac pathRet /= "Library/Application Support"; fs::create_directory(pathRet); @@ -1290,16 +1253,23 @@ void ShrinkDebugFile() if (file && GetFilesize(file) > 10 * 1000000) { // Restart the file with some of the end - char pch[200000]; - fseek(file, -((long long)sizeof(pch)), SEEK_END); - size_t nBytes = fread(pch, 1, sizeof(pch), file); - fclose(file); - - file = fopen(pathLog.string().c_str(), "w"); - if (file) - { - fwrite(pch, 1, nBytes, file); + try { + vector* vBuf = new vector (200000, 0); + fseek(file, -((long)(vBuf->size())), SEEK_END); + size_t nBytes = fread(&vBuf->operator[](0), 1, vBuf->size(), file); fclose(file); + file = fopen(pathLog.string().c_str(), "w"); + if (file) + { + fwrite(&vBuf->operator[](0), 1, nBytes, file); + fclose(file); + } + delete vBuf; + } + catch (const bad_alloc& e) { + // Bad things happen - no free memory in heap at program startup + fclose(file); + printf("Warning: %s in %s:%d\n ShrinkDebugFile failed - debug.log expands further", e.what(), __FILE__, __LINE__); } } } @@ -1322,7 +1292,9 @@ void ShrinkDebugFile() // System clock int64_t GetTime() { - return time(NULL); + int64_t now = time(NULL); + assert(now > 0); + return now; } // Trusted NTP offset or median of NTP samples. @@ -1464,16 +1436,10 @@ void RenameThread(const char* name) #if defined(PR_SET_NAME) // Only the first 15 characters are used (16 - NUL terminator) ::prctl(PR_SET_NAME, name, 0, 0, 0); -#elif 0 && (defined(__FreeBSD__) || defined(__OpenBSD__)) - // TODO: This is currently disabled because it needs to be verified to work - // on FreeBSD or OpenBSD first. When verified the '0 &&' part can be - // removed. +#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) pthread_set_name_np(pthread_self(), name); - -// This is XCode 10.6-and-later; bring back if we drop 10.5 support: -// #elif defined(MAC_OSX) -// pthread_setname_np(name); - +#elif defined(__APPLE__) + pthread_setname_np(name); #else // Prevent warnings for unused parameters... (void)name; @@ -1500,4 +1466,4 @@ std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime) ss.imbue(loc); ss << boost::posix_time::from_time_t(nTime); return ss.str(); -} \ No newline at end of file +}