boost_mirror/core
1
0
Fork 0
mirror of https://github.com/boostorg/core.git synced 2025-05-09 23:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #133 from boostorg/feature/lwt_remove_snprintf

Browse Source 
Remove the use of snprintf for trivial formatting in lightweight_test
This commit is contained in:
Peter Dimov 2022-12-09 18:55:14 +02:00 committed by GitHub
commit 23fa5d30f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/boost/core/lightweight_test.hpp
View File

@ -32,7 +32,6 @@
#include <cstring> #include <cstring>
#include <cstddef> #include <cstddef>
#include <cctype> #include <cctype>
#include <cstdio>
#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG) #if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
# include <crtdbg.h> # include <crtdbg.h>
@ -197,18 +196,6 @@ inline unsigned long test_output_impl( char16_t const& v ) { return v; }
inline unsigned long test_output_impl( char32_t const& v ) { return v; } inline unsigned long test_output_impl( char32_t const& v ) { return v; }
#endif #endif
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4996)
#endif
// Use snprintf if available as some compilers (clang 14.0) issue deprecation warnings for sprintf
#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
# define BOOST_CORE_DETAIL_SNPRINTF(buffer, format, arg) std::sprintf(buffer, format, arg)
#else
# define BOOST_CORE_DETAIL_SNPRINTF(buffer, format, arg) std::snprintf(buffer, sizeof(buffer)/sizeof(buffer[0]), format, arg)
#endif
inline std::string test_output_impl( char const& v ) inline std::string test_output_impl( char const& v )
{ {
if( std::isprint( static_cast<unsigned char>( v ) ) ) if( std::isprint( static_cast<unsigned char>( v ) ) )
@ -217,19 +204,17 @@ inline std::string test_output_impl( char const& v )
} }
else else
{ {
char buffer[ 8 ]; static const char char_table[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
BOOST_CORE_DETAIL_SNPRINTF( buffer, "\\x%02X", static_cast<unsigned char>( v ) ); char buffer[ 4 ];
buffer[ 0 ] = '\\';
buffer[ 1 ] = 'x';
buffer[ 2 ] = char_table[ (static_cast<unsigned char>( v ) >> 4u) & 0x0f ];
buffer[ 3 ] = char_table[ static_cast<unsigned char>( v ) & 0x0f ];
return buffer; return std::string( buffer, 4u );
} }
} }
#undef BOOST_CORE_DETAIL_SNPRINTF
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
// predicates // predicates
struct lw_test_eq struct lw_test_eq