diff options
Diffstat (limited to 'src/pal/tests/palsuite/c_runtime/swscanf')
35 files changed, 28 insertions, 28 deletions
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h index 1cac450cf4..6349b7dcd6 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h +++ b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h @@ -14,7 +14,7 @@ #ifndef __SWSCANF_H__ #define __SWSCANF_H__ -void DoVoidTest(WCHAR *inputstr, WCHAR *formatstr) +void DoVoidTest(WCHAR *inputstr, const WCHAR *formatstr) { char buf[256] = { 0 }; int i; @@ -40,7 +40,7 @@ void DoVoidTest(WCHAR *inputstr, WCHAR *formatstr) } -void DoStrTest(WCHAR *inputstr, WCHAR *formatstr, char *checkstr) +void DoStrTest(WCHAR *inputstr, const WCHAR *formatstr, const char *checkstr) { char buf[256] = { 0 }; int ret; @@ -63,7 +63,7 @@ void DoStrTest(WCHAR *inputstr, WCHAR *formatstr, char *checkstr) } -void DoWStrTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkstr) +void DoWStrTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; int ret; @@ -86,7 +86,7 @@ void DoWStrTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkstr) } -void DoNumTest(WCHAR *inputstr, WCHAR *formatstr, int checknum) +void DoNumTest(WCHAR *inputstr, const WCHAR *formatstr, int checknum) { int num = 0; int ret; @@ -107,7 +107,7 @@ void DoNumTest(WCHAR *inputstr, WCHAR *formatstr, int checknum) } } -void DoShortNumTest(WCHAR *inputstr, WCHAR *formatstr, short checknum) +void DoShortNumTest(WCHAR *inputstr, const WCHAR *formatstr, short checknum) { short num = 0; int ret; @@ -128,7 +128,7 @@ void DoShortNumTest(WCHAR *inputstr, WCHAR *formatstr, short checknum) } } -void DoI64NumTest(WCHAR *inputstr, WCHAR *formatstr, INT64 checknum) +void DoI64NumTest(WCHAR *inputstr, const WCHAR *formatstr, INT64 checknum) { char buf[256]; char check[256]; @@ -145,15 +145,15 @@ void DoI64NumTest(WCHAR *inputstr, WCHAR *formatstr, INT64 checknum) if (checknum != num) { - sprintf(buf, "%I64d", num); - sprintf(check, "%I64d", checknum); + sprintf_s(buf, _countof(buf), "%I64d", num); + sprintf_s(check, _countof(check), "%I64d", checknum); Fail("ERROR: scanned I64 number incorrectly from \"%s\" using \"%s\".\n" "Expected %s, got %s.\n", convertC(inputstr), convertC(formatstr), check, buf); } } -void DoCharTest(WCHAR *inputstr, WCHAR*formatstr, char* checkchars, int numchars) +void DoCharTest(WCHAR *inputstr, const WCHAR *formatstr, char* checkchars, int numchars) { char buf[256]; int ret; @@ -187,7 +187,7 @@ void DoCharTest(WCHAR *inputstr, WCHAR*formatstr, char* checkchars, int numchars } } -void DoWCharTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkchars, int numchars) +void DoWCharTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkchars, int numchars) { WCHAR buf[256]; int ret; @@ -223,7 +223,7 @@ void DoWCharTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkchars, int numch } -void DoFloatTest(WCHAR *inputstr, WCHAR *formatstr, float checkval) +void DoFloatTest(WCHAR *inputstr, const WCHAR *formatstr, float checkval) { char buf[256] = { 0 }; float val; diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt index 030aaaf709..44b8939248 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test1.c + test1.cpp ) add_executable(paltest_swscanf_test1 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp index 66136e57c5..66136e57c5 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt index f7c8b284ff..27d42114a9 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test10.c + test10.cpp ) add_executable(paltest_swscanf_test10 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp index a8628e0de1..a8628e0de1 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt index 17066f31b8..1ca9224ec0 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test11.c + test11.cpp ) add_executable(paltest_swscanf_test11 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp index f7eb4af46f..f7eb4af46f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt index 95f5174ecb..44d70f47ae 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test12.c + test12.cpp ) add_executable(paltest_swscanf_test12 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp index f5f8bbdf8a..f5f8bbdf8a 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt index 47abc50313..add0cbfe18 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test13.c + test13.cpp ) add_executable(paltest_swscanf_test13 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp index 1bb0b7b21c..1bb0b7b21c 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt index a470436ce7..126e087b1c 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test14.c + test14.cpp ) add_executable(paltest_swscanf_test14 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp index 80581b726f..80581b726f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt index d89650b12c..7c2da2bdf8 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test15.c + test15.cpp ) add_executable(paltest_swscanf_test15 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp index 9b7d277e17..9b7d277e17 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt index a2a00f11b6..ba28c4dc2f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test16.c + test16.cpp ) add_executable(paltest_swscanf_test16 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp index c83b64468b..c83b64468b 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt index c224f5d9a6..225ce868ed 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test17.c + test17.cpp ) add_executable(paltest_swscanf_test17 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp index 9023f7020a..9023f7020a 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt index a5335ddb48..15411ecf21 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test2.c + test2.cpp ) add_executable(paltest_swscanf_test2 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp index 8fbd3f86ba..8fbd3f86ba 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt index 5c229c26d3..927026107a 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test3.c + test3.cpp ) add_executable(paltest_swscanf_test3 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp index 8b05df20f2..8b05df20f2 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt index 5e281aaf34..eec701645b 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test4.c + test4.cpp ) add_executable(paltest_swscanf_test4 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp index d63d25b7d0..d63d25b7d0 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt index 8b259aa78d..3f022db16c 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test5.c + test5.cpp ) add_executable(paltest_swscanf_test5 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp index 8ae2d81da6..8ae2d81da6 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt index c3fd8696ab..c55666d95c 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test6.c + test6.cpp ) add_executable(paltest_swscanf_test6 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp index 982f799cfc..982f799cfc 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt index 00541306df..adb0abe80d 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test7.c + test7.cpp ) add_executable(paltest_swscanf_test7 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp index 45e9400549..45e9400549 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt index d6aa631ab9..a69c552337 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test8.c + test8.cpp ) add_executable(paltest_swscanf_test8 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp index a244de748f..a244de748f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt index 4f7595a205..70a9fe2064 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test9.c + test9.cpp ) add_executable(paltest_swscanf_test9 diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp index e289d26f58..e289d26f58 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.c +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp |