jessica
/
Jupiter
mirror of https://github.com/JAJames/Jupiter.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added JUPITER_VSCWPRINTF macro; replaced some vswprintf() calls as appropriate.

release/0.19
JustinAJ 10 years ago
parent
7c35d7dcd0
commit
cff825f7fe
3 changed files with 10 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Jupiter/CString_Imp.h
  2. 10
      Jupiter/String_Imp.h
  3. BIN
      Release/Jupiter.lib

6
Jupiter/CString_Imp.h
View File

@ -42,8 +42,10 @@
#if defined _WIN32 #if defined _WIN32
#define JUPITER_VSCPRINTF(format, format_args) _vscprintf(format, format_args) #define JUPITER_VSCPRINTF(format, format_args) _vscprintf(format, format_args)
#define JUPITER_VSCWPRINTF(format, format_args) _vscwprintf(format, format_args)
#else // _WIN32 #else // _WIN32
#define JUPITER_VSCPRINTF(format, format_args) vsnprintf(nullptr, 0, format, format_args) #define JUPITER_VSCPRINTF(format, format_args) vsnprintf(nullptr, 0, format, format_args)
#define JUPITER_VSCWPRINTF(format, format_args) vswprintf(nullptr, 0, format, format_args)
#endif // _WIN32 #endif // _WIN32
#endif // JUPITER_VSCPRINTF #endif // JUPITER_VSCPRINTF
@ -166,7 +168,7 @@ template<> size_t inline Jupiter::CString_Type<wchar_t>::vformat(const wchar_t *
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
this->setBufferSizeNoCopy(minLen); this->setBufferSizeNoCopy(minLen);
@ -205,7 +207,7 @@ template<> size_t inline Jupiter::CString_Type<wchar_t>::avformat(const wchar_t
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length); this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length);

10
Jupiter/String_Imp.h
View File

@ -41,8 +41,10 @@
#if defined _WIN32 #if defined _WIN32
#define JUPITER_VSCPRINTF(format, format_args) _vscprintf(format, format_args) #define JUPITER_VSCPRINTF(format, format_args) _vscprintf(format, format_args)
#define JUPITER_VSCWPRINTF(format, format_args) _vscwprintf(format, format_args)
#else // _WIN32 #else // _WIN32
#define JUPITER_VSCPRINTF(format, format_args) vsnprintf(nullptr, 0, format, format_args) #define JUPITER_VSCPRINTF(format, format_args) vsnprintf(nullptr, 0, format, format_args)
#define JUPITER_VSCWPRINTF(format, format_args) vswprintf(nullptr, 0, format, format_args)
#endif // _WIN32 #endif // _WIN32
#endif // JUPITER_VSCPRINTF #endif // JUPITER_VSCPRINTF
@ -125,7 +127,7 @@ template<> size_t inline Jupiter::String_Strict<wchar_t>::vformat(const wchar_t
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
@ -163,7 +165,7 @@ template<> size_t inline Jupiter::String_Strict<wchar_t>::avformat(const wchar_t
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length + 1); // vsnprintf REQUIRES space for an additional null character. this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length + 1); // vsnprintf REQUIRES space for an additional null character.
@ -415,7 +417,7 @@ template<> size_t inline Jupiter::String_Loose<wchar_t>::vformat(const wchar_t *
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
@ -453,7 +455,7 @@ template<> size_t inline Jupiter::String_Loose<wchar_t>::avformat(const wchar_t
int minLen; int minLen;
va_list sargs; va_list sargs;
va_copy(sargs, args); va_copy(sargs, args);
minLen = vswprintf(nullptr, 0, format, sargs); minLen = JUPITER_VSCWPRINTF(format, sargs);
va_end(sargs); va_end(sargs);
if (minLen < 0) return 0; // We simply can not work with this. if (minLen < 0) return 0; // We simply can not work with this.
this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length + 1); // vsnprintf REQUIRES space for an additional null character. this->setBufferSize(minLen + Jupiter::String_Type<wchar_t>::length + 1); // vsnprintf REQUIRES space for an additional null character.

BIN
Release/Jupiter.lib
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save