Mercurial > hg > bitcoin

changeset 3495:89393e88d1f4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup some unused macros from util.h Encapsulate _snprintf/sprintf difference in implementation not header
author Wladimir J. van der Laan <laanwj@gmail.com>
date Sun, 09 Sep 2012 14:50:31 +0200
parents aa323efdf02c
children 97cec275ad51
files src/util.cpp src/util.h
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -284,7 +284,11 @@
     {
         va_list arg_ptr;
         va_copy(arg_ptr, ap);
+#ifdef WIN32
         ret = _vsnprintf(p, limit, format, arg_ptr);
+#else
+        ret = vsnprintf(p, limit, format, arg_ptr);
+#endif
         va_end(arg_ptr);
         if (ret >= 0 && ret < limit)
             break;
--- a/src/util.h
+++ b/src/util.h
@@ -79,11 +79,7 @@
 #define S_IRUSR             0400
 #define S_IWUSR             0200
 #endif
-#define unlink              _unlink
 #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
 inline void Sleep(int64 n)
 {
@@ -130,7 +126,6 @@
 void RandAddSeed();
 void RandAddSeedPerfmon();
 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: