diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-05-20 01:30:18 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-05-20 01:30:18 -0700 |
| commit | 01ecb074a7b187d96c52d4ea5bb197afccc9a1e5 (patch) | |
| tree | 2fad025ec3c2a95f86152636078b69e1e9c9b91f /src/util.h | |
| parent | cde87ee75cd95b076259e146705bf34b66cd83aa (diff) | |
| parent | 29b79e4c0ea6b83281ba782d109a77bac47933d8 (diff) | |
Merge pull request #1302 from laanwj/2012_05_utilstrings
Get rid of snprintf (except one) with fixed buffers, shorten code
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/util.h b/src/util.h index f7bdaf5332..b90cb43eec 100644 --- a/src/util.h +++ b/src/util.h @@ -43,11 +43,6 @@ static const int64 CENT = 1000000; #define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0])) #define printf OutputDebugStringF -#ifdef snprintf -#undef snprintf -#endif -#define snprintf my_snprintf - #ifndef PRI64d #if defined(_MSC_VER) || defined(__MSVCRT__) #define PRI64d "I64d" @@ -133,6 +128,7 @@ int my_snprintf(char* buffer, size_t limit, const char* format, ...); */ std::string real_strprintf(const std::string &format, int dummy, ...); #define strprintf(format, ...) real_strprintf(format, 0, __VA_ARGS__) +std::string vstrprintf(const std::string &format, va_list ap); bool error(const char *format, ...); void LogException(std::exception* pex, const char* pszThread); |