Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove __vsnprintf to declutter global namespace

Browse Source 
It is usual for WinStd to have A and W versions of the same function.
Why would vsnprintf be different?

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-01-09 21:49:09 +01:00
parent cbb221fce4
commit f5de1accad
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
include/WinStd/Common.h
View File

@ -243,19 +243,44 @@ inline SIZE_T SIZETAdd(SIZE_T a, SIZE_T b)
/// \addtogroup WinStdStrFormat /// \addtogroup WinStdStrFormat
/// @{ /// @{
/// \cond internal ///
static inline int __vsnprintf(_Out_z_cap_(capacity) char* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const char* format, _In_ va_list arg) /// Formats string using `printf()`.
///
/// \param[out] str Formatted string
/// \param[in ] format String template using `printf()` style
/// \param[in ] arg Arguments to `format`
///
/// \returns Number of characters in result.
///
template<class _Traits, class _Ax>
static int vsprintf(_Inout_ std::basic_string<char, _Traits, _Ax> &str, _In_z_ _Printf_format_string_ const char *format, _In_ va_list arg)
{ {
#pragma warning(suppress: 4996) char buf[WINSTD_STACK_BUFFER_BYTES/sizeof(char)];
return _vsnprintf(str, capacity, format, arg);
}
static inline int __vsnprintf(_Out_z_cap_(capacity) wchar_t* str, _In_ size_t capacity, _In_z_ _Printf_format_string_params_(2) const wchar_t* format, _In_ va_list arg) // Try with stack buffer first.
{ int count = _vsnprintf(buf, _countof(buf), format, arg);
#pragma warning(suppress: 4996) if (0 <= count && count < _countof(buf)) {
return _vsnwprintf(str, capacity, format, arg); // Copy from stack.
str.append(buf, count);
return count;
}
if (count < 0) {
switch (errno) {
case 0:
count = _vsnprintf(NULL, 0, format, arg);
assert(count >= 0);
break;
case EINVAL: throw std::invalid_argument("invalid vsnprintf arguments");
case EILSEQ: throw std::runtime_error("encoding error");
default: throw std::runtime_error("failed to format string");
}
}
size_t offset = str.size();
str.resize(offset + count);
if (_vsnprintf(&str[offset], count + 1, format, arg) != count)
throw std::runtime_error("failed to format string");
return count;
} }
/// \endcond
/// ///
/// Formats string using `printf()`. /// Formats string using `printf()`.
@ -266,13 +291,13 @@ static inline int __vsnprintf(_Out_z_cap_(capacity) wchar_t* str, _In_ size_t ca
/// ///
/// \returns Number of characters in result. /// \returns Number of characters in result.
/// ///
template<class _Elem, class _Traits, class _Ax> template<class _Traits, class _Ax>
static int vsprintf(_Inout_ std::basic_string<_Elem, _Traits, _Ax> &str, _In_z_ _Printf_format_string_ const _Elem *format, _In_ va_list arg) static int vsprintf(_Inout_ std::basic_string<wchar_t, _Traits, _Ax> &str, _In_z_ _Printf_format_string_ const wchar_t *format, _In_ va_list arg)
{ {
_Elem buf[WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem)]; wchar_t buf[WINSTD_STACK_BUFFER_BYTES/sizeof(wchar_t)];
// Try with stack buffer first. // Try with stack buffer first.
int count = __vsnprintf(buf, _countof(buf), format, arg); int count = _vsnwprintf(buf, _countof(buf), format, arg);
if (0 <= count && count < _countof(buf)) { if (0 <= count && count < _countof(buf)) {
// Copy from stack. // Copy from stack.
str.append(buf, count); str.append(buf, count);
@ -281,7 +306,7 @@ static int vsprintf(_Inout_ std::basic_string<_Elem, _Traits, _Ax> &str, _In_z_
if (count < 0) { if (count < 0) {
switch (errno) { switch (errno) {
case 0: case 0:
count = __vsnprintf(NULL, 0, format, arg); count = _vsnwprintf(NULL, 0, format, arg);
assert(count >= 0); assert(count >= 0);
break; break;
case EINVAL: throw std::invalid_argument("invalid vsnprintf arguments"); case EINVAL: throw std::invalid_argument("invalid vsnprintf arguments");
@ -291,7 +316,7 @@ static int vsprintf(_Inout_ std::basic_string<_Elem, _Traits, _Ax> &str, _In_z_
} }
size_t offset = str.size(); size_t offset = str.size();
str.resize(offset + count); str.resize(offset + count);
if (__vsnprintf(&str[offset], count + 1, format, arg) != count) if (_vsnwprintf(&str[offset], count + 1, format, arg) != count)
throw std::runtime_error("failed to format string"); throw std::runtime_error("failed to format string");
return count; return count;
} }