sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some unused macros from util.h

Browse Source 
Encapsulate _snprintf/sprintf difference in implementation not header
This commit is contained in:
Wladimir J. van der Laan 2012-09-09 14:50:31 +02:00
parent b0a90fbb0c
commit 963af6449f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util.cpp
View File

@ -284,7 +284,11 @@ string vstrprintf(const char *format, va_list ap)
{ {
va_list arg_ptr; va_list arg_ptr;
va_copy(arg_ptr, ap); va_copy(arg_ptr, ap);
#ifdef WIN32
ret = _vsnprintf(p, limit, format, arg_ptr); ret = _vsnprintf(p, limit, format, arg_ptr);
#else
ret = vsnprintf(p, limit, format, arg_ptr);
#endif
va_end(arg_ptr); va_end(arg_ptr);
if (ret >= 0 && ret < limit) if (ret >= 0 && ret < limit)
break; break;

5
src/util.h
View File

@ -79,11 +79,7 @@ T* alignup(T* p)
#define S_IRUSR 0400 #define S_IRUSR 0400
#define S_IWUSR 0200 #define S_IWUSR 0200
#endif #endif
#define unlink _unlink
#else #else
#define _vsnprintf(a,b,c,d) vsnprintf(a,b,c,d)
#define strlwr(psz) to_lower(psz)
#define _strlwr(psz) to_lower(psz)
#define MAX_PATH 1024 #define MAX_PATH 1024
inline void Sleep(int64 n) inline void Sleep(int64 n)
{ {
@ -130,7 +126,6 @@ extern bool fReopenDebugLog;
void RandAddSeed(); void RandAddSeed();
void RandAddSeedPerfmon(); void RandAddSeedPerfmon();
int ATTR_WARN_PRINTF(1,2) OutputDebugStringF(const char* pszFormat, ...); int ATTR_WARN_PRINTF(1,2) OutputDebugStringF(const char* pszFormat, ...);
int my_snprintf(char* buffer, size_t limit, const char* format, ...);
/* /*
Rationale for the real_strprintf / strprintf construction: Rationale for the real_strprintf / strprintf construction: