From 67cbf2c0a83c6b2d09bfc2e729773d423abad1ce Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Fri, 27 Nov 2015 02:45:33 +0900 Subject: [PATCH] Silence a GCC warning in tests about ignoring a return value. --- tests/utils.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/utils.h b/tests/utils.h index de51c04c..99a7c669 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -30,17 +30,11 @@ inline string copyFile(const string &filename, const string &ext) char testFileName[1024]; #ifdef _WIN32 - GetTempPathA(sizeof(testFileName), testFileName); - GetTempFileNameA(testFileName, "tag", 0, testFileName); - DeleteFileA(testFileName); -# if defined(_MSC_VER) && _MSC_VER > 1500 - strcat_s(testFileName, ext.c_str()); -# else - strcat(testFileName, ext.c_str()); -# endif + char tempDir[MAX_PATH + 1]; + GetTempPathA(sizeof(tempDir), tempDir); + wsprintfA(testFileName, "%s\\taglib-test%s", tempDir, ext.c_str()); #else - snprintf(testFileName, sizeof(testFileName), "/%s/taglib-test-XXXXXX%s", P_tmpdir, ext.c_str()); - static_cast(mkstemps(testFileName, 6)); + snprintf(testFileName, sizeof(testFileName), "/%s/taglib-test%s", P_tmpdir, ext.c_str()); #endif string sourceFileName = testFilePath(filename) + ext;