gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conditionally use strncpy_s on MSVC

Browse source
This commit is contained in:
Hugo Melder 2022-08-02 17:46:37 +02:00
parent 360ec400bc
commit 1b247a9b4c
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
TestFramework/Testing.h
View file

@ -40,6 +40,14 @@
id __work_around_clang_bug = @"__unused__";
#endif
/* strncpy is deprecated on Windows MSVC. Use strncpy_s instead.
*/
#if defined(_MSC_VER)
#define STRNCPY(dest, size_dest, src, size_src) strncpy_s(dest, size_dest, src, size_src);
#else
#define STRNCPY(dest, size_dest, src, size_src) strncpy(dest, src, size_dest);
#endif
/* A flag indicating that the testsuite is currently processing tests
* which are actually not expected to pass, but where we hope someone
* might have committed a bugfix.
@ -473,15 +481,9 @@ static void testStart()
BOOL _save_hopeful = testHopeful; \
unsigned _save_indentation = testIndentation; \
int _save_line = __LINE__; \
size_t _save_set_size = strlen(setName) + 1 \
size_t _save_set_size = strlen(setName) + 1; \
char *_save_set = (char*)malloc(_save_set_size); \
/* strncpy is deprecated on MSVC
*/
#if defined(_MSC_VER)
strncpy_s(_save_set, _save_set_size, setName, _save_set_size); \
#else
strncpy(_save_set, setName, strlen(setName) + 1); \
#endif
STRNCPY(_save_set, _save_set_size, setName, _save_set_size); \
fprintf(stderr, "Start set: "); \
testIndent(); \
fprintf(stderr, "%s:%d ... %s\n", __FILE__, __LINE__, _save_set); \