generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-16 07:23:45 +02:00
Code Issues Projects Releases Wiki Activity

Attempt to fix Windows build for tests.

Browse Source 
Use sprintf_s (windows) or snprintf (others) instead of sprintf in unit tests.
This commit is contained in:
Vincent Mallet
2021-03-23 14:57:07 -07:00
parent 1c97e051ad
commit f06b46d412
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/msgpack_c.cpp
View File

@@ -21,6 +21,12 @@
#define msgpack_rand() drand48() #define msgpack_rand() drand48()
#endif // _MSC_VER || __MINGW32__ #endif // _MSC_VER || __MINGW32__
#if defined(_MSC_VER)
#define msgpack_snprintf sprintf_s
#else // _MSC_VER
#define msgpack_snprintf snprintf
#endif // _MSC_VER
using namespace std; using namespace std;
const unsigned int kLoop = 10000; const unsigned int kLoop = 10000;
@@ -1261,7 +1267,8 @@ TEST(MSGPACKC, simple_object_print_buffer_array_str)
EXPECT_EQ(str_size, o.via.str.size); EXPECT_EQ(str_size, o.via.str.size);
EXPECT_EQ(0, memcmp(str, o.via.str.ptr, str_size)); EXPECT_EQ(0, memcmp(str, o.via.str.ptr, str_size));
sprintf(expected, "[\"%s\"]", str); msgpack_snprintf(expected, sizeof(expected), "[\"%s\"]", str);
expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s
msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj);
EXPECT_STREQ(expected, buffer); EXPECT_STREQ(expected, buffer);
@@ -1341,7 +1348,8 @@ TEST(MSGPACKC, simple_object_print_buffer_map_str)
EXPECT_EQ(mval_size, val.via.str.size); EXPECT_EQ(mval_size, val.via.str.size);
EXPECT_EQ(0, memcmp(mval, val.via.str.ptr, mval_size)); EXPECT_EQ(0, memcmp(mval, val.via.str.ptr, mval_size));
sprintf(expected, "{\"%s\"=>\"%s\"}", mkey, mval); msgpack_snprintf(expected, sizeof(expected), "{\"%s\"=>\"%s\"}", mkey, mval);
expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s
msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj);
EXPECT_STREQ(expected, buffer); EXPECT_STREQ(expected, buffer);
@@ -1384,7 +1392,8 @@ TEST(MSGPACKC, simple_object_print_buffer_map_str_empty)
EXPECT_EQ(MSGPACK_OBJECT_STR, val.type); EXPECT_EQ(MSGPACK_OBJECT_STR, val.type);
EXPECT_EQ(0UL, val.via.str.size); EXPECT_EQ(0UL, val.via.str.size);
sprintf(expected, "{\"%s\"=>\"\"}", mkey); msgpack_snprintf(expected, sizeof(expected), "{\"%s\"=>\"\"}", mkey);
expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s
msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj);
EXPECT_STREQ(expected, buffer); EXPECT_STREQ(expected, buffer);