Skip to content

Commit f87d9ad

Browse files
firewavefirewave
committed
deprecated platform types win32A and win32W in favor of win32a and win32w 
1 parent a00b6e1 commit f87d9ad

11 files changed

+376
-347
lines changed

‎cfg/windows.cfg

+328-328
Large diffs are not rendered by default.

‎cli/cmdlineparser.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
10391039
printMessage("Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.");
10401040
#elif defined(_WIN32)
10411041
if (SHOW_DEF_PLATFORM_MSG && default_platform)
1042-
printMessage("Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.");
1042+
printMessage("Windows 32-bit binaries currently default to the 'win32a' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32a' explicitly if you rely on this.");
10431043
#endif
10441044

10451045
// Print error only if we have "real" command and expect files
@@ -1215,9 +1215,9 @@ void CmdLineParser::printHelp()
12151215
" 32 bit unix variant\n"
12161216
" * unix64\n"
12171217
" 64 bit unix variant\n"
1218-
" * win32A\n"
1218+
" * win32a\n"
12191219
" 32 bit Windows ASCII character encoding\n"
1220-
" * win32W\n"
1220+
" * win32w\n"
12211221
" 32 bit Windows UNICODE character encoding\n"
12221222
" * win64\n"
12231223
" 64 bit Windows\n"

‎gui/projectfile.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class ProjectFile : public QObject {
159159

160160
/**
161161
* @brief Get platform.
162-
* @return Current platform. If it ends with .xml then it is a file. Otherwise it must match one of the return values from @sa cppcheck::Platform::toString() ("win32A", "unix32", ..)
162+
* @return Current platform. If it ends with .xml then it is a file. Otherwise it must match one of the return values from @sa cppcheck::Platform::toString() ("win32a", "unix32", ..)
163163
*/
164164
QString getPlatform() const {
165165
return mPlatform;

‎lib/platform.cpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,17 @@ bool cppcheck::Platform::set(Type t)
159159

160160
bool cppcheck::Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool verbose)
161161
{
162-
if (platformstr == "win32A")
162+
if (platformstr == "win32A") {
163+
std::cout << "Platform 'win32A' is deprecated. Please use 'win32a' instead." << std::endl;
163164
set(Type::Win32A);
164-
else if (platformstr == "win32W")
165+
}
166+
else if (platformstr == "win32a")
167+
set(Type::Win32A);
168+
else if (platformstr == "win32W") {
169+
std::cout << "Platform 'win32W' is deprecated. Please use 'win32w' instead." << std::endl;
170+
set(Type::Win32W);
171+
}
172+
else if (platformstr == "win32w")
165173
set(Type::Win32W);
166174
else if (platformstr == "win64")
167175
set(Type::Win64);

‎lib/platform.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ namespace cppcheck {
153153
case Type::Native:
154154
return "native";
155155
case Type::Win32A:
156-
return "win32A";
156+
return "win32a";
157157
case Type::Win32W:
158-
return "win32W";
158+
return "win32w";
159159
case Type::Win64:
160160
return "win64";
161161
case Type::Unix32:

‎man/cppcheck.1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ There are false positives with this option. Each result must be carefully invest
486486
</term>
487487
<listitem>
488488
<para>Specifies platform specific types and sizes.The available platforms are:
489-
<glosslist><glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>win32A</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry><glossentry><glossterm>win32W</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry><glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry></glosslist>
489+
<glosslist><glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>win32a</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry><glossentry><glossterm>win32w</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry><glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry></glosslist>
490490
By default the platform which was used to compile Cppcheck is used.
491491
</para>
492492
</listitem>

‎releasenotes.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ release notes for cppcheck-2.11
33
- The platform type 'Unspecified' within .cppcheck projects has been deprecated and will be removed in Cppcheck 2.14. Please use 'unspecified' instead.
44
- It is no longer necessary to run "--check-config" to get detailed "missingInclude" and "missingIncludeSystem" messages. They will always be issued in the regular analysis if "missingInclude" is enabled.
55
- "missingInclude" and "missingIncludeSystem" are reported with "-j" is > 1 and processes are used in the backend (default in non-Windows binaries)
6-
- "missingInclude" and "missingIncludeSystem" will now cause the "--error-exitcode" to be applied
6+
- "missingInclude" and "missingIncludeSystem" will now cause the "--error-exitcode" to be applied
7+
- The platform types 'Win32A' and 'Win32W' has been deprecated and will be removed in Cppcheck 2.14. Please use 'win32a' and 'win32w' respectively.

‎test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ if (BUILD_TESTS)
148148
add_cfg(sqlite3.c)
149149
add_cfg(std.c)
150150
add_cfg(std.cpp)
151-
add_cfg(windows.cpp NAME windows32A PLATFORM win32A)
152-
add_cfg(windows.cpp NAME windows32W PLATFORM win32W)
151+
add_cfg(windows.cpp NAME windows32A PLATFORM win32a)
152+
add_cfg(windows.cpp NAME windows32W PLATFORM win32w)
153153
add_cfg(windows.cpp NAME windows64 PLATFORM win64)
154154
add_cfg(wxwidgets.cpp)
155155

‎test/cfg/runtests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,8 @@ function check_file {
499499
;;
500500
windows.cpp)
501501
windows_fn
502-
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32A --library=$lib ${DIR}$f
503-
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32W --library=$lib ${DIR}$f
502+
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32a --library=$lib ${DIR}$f
503+
${CPPCHECK} ${CPPCHECK_OPT} --platform=win32w --library=$lib ${DIR}$f
504504
${CPPCHECK} ${CPPCHECK_OPT} --platform=win64 --library=$lib ${DIR}$f
505505
;;
506506
wxwidgets.cpp)

‎test/testcmdlineparser.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ class TestCmdlineParser : public TestFixture {
133133
TEST_CASE(stdunknown);
134134
TEST_CASE(platformWin64);
135135
TEST_CASE(platformWin32A);
136+
TEST_CASE(platformWin32a);
136137
TEST_CASE(platformWin32W);
138+
TEST_CASE(platformWin32w);
137139
TEST_CASE(platformUnix32);
138140
TEST_CASE(platformUnix32Unsigned);
139141
TEST_CASE(platformUnix64);
@@ -998,6 +1000,15 @@ class TestCmdlineParser : public TestFixture {
9981000
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
9991001
ASSERT(defParser.parseFromArgs(3, argv));
10001002
ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
1003+
ASSERT_EQUALS("Platform 'win32A' is deprecated. Please use 'win32a' instead.\n", GET_REDIRECT_OUTPUT);
1004+
}
1005+
1006+
void platformWin32a() {
1007+
REDIRECT;
1008+
const char * const argv[] = {"cppcheck", "--platform=win32a", "file.cpp"};
1009+
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
1010+
ASSERT(defParser.parseFromArgs(3, argv));
1011+
ASSERT_EQUALS(Settings::Win32A, settings.platformType);
10011012
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
10021013
}
10031014

@@ -1006,6 +1017,15 @@ class TestCmdlineParser : public TestFixture {
10061017
const char * const argv[] = {"cppcheck", "--platform=win32W", "file.cpp"};
10071018
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
10081019
ASSERT(defParser.parseFromArgs(3, argv));
1020+
ASSERT_EQUALS(Settings::Win32W, settings.platformType);
1021+
ASSERT_EQUALS("Platform 'win32W' is deprecated. Please use 'win32w' instead.\n", GET_REDIRECT_OUTPUT);
1022+
}
1023+
1024+
void platformWin32w() {
1025+
REDIRECT;
1026+
const char * const argv[] = {"cppcheck", "--platform=win32w", "file.cpp"};
1027+
ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
1028+
ASSERT(defParser.parseFromArgs(3, argv));
10091029
ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings.platform.type);
10101030
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
10111031
}
@@ -1094,7 +1114,7 @@ class TestCmdlineParser : public TestFixture {
10941114
ASSERT_EQUALS("cppcheck: Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
10951115
#elif defined(_WIN32)
10961116
ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
1097-
ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
1117+
ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32a' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32a' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
10981118
#endif
10991119

11001120
CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;

‎test/testtokenize.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5433,10 +5433,10 @@ class TestTokenizer : public TestFixture {
54335433
"float * ptrToFloat ;";
54345434

54355435
// These types should be defined the same on all Windows platforms
5436-
const std::string win32A = tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A);
5437-
ASSERT_EQUALS(expected, win32A);
5438-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
5439-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win64));
5436+
const std::string win32a = tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A);
5437+
ASSERT_EQUALS(expected, win32a);
5438+
ASSERT_EQUALS(win32a, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
5439+
ASSERT_EQUALS(win32a, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win64));
54405440
}
54415441

54425442
void platformWin32A() {

0 commit comments

Comments
 (0)