This commit is contained in:
Sébastien Debrard 2011-02-18 20:51:19 +01:00
commit fcac0f2f81
10 changed files with 130 additions and 117 deletions

View File

@ -1,7 +1,7 @@
# This file is generated by tools/dmake, do not edit.
ifndef CXXFLAGS
CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -g
endif
ifndef CXX
@ -192,7 +192,7 @@ lib/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/checkunusedfunction
lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/preprocessor.h lib/path.h lib/timer.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/cppcheck.o lib/cppcheck.cpp
lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/path.h lib/cppcheck.h lib/settings.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h
lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/settings.h lib/path.h lib/cppcheck.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/errorlogger.o lib/errorlogger.cpp
lib/executionpath.o: lib/executionpath.cpp lib/executionpath.h lib/token.h
@ -216,7 +216,7 @@ lib/symboldatabase.o: lib/symboldatabase.cpp lib/symboldatabase.h lib/token.h li
lib/timer.o: lib/timer.cpp lib/timer.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/timer.o lib/timer.cpp
lib/token.o: lib/token.cpp lib/token.h lib/errorlogger.h lib/check.h lib/tokenize.h lib/settings.h
lib/token.o: lib/token.cpp lib/token.h lib/errorlogger.h lib/settings.h lib/check.h lib/tokenize.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o lib/token.o lib/token.cpp
lib/tokenize.o: lib/tokenize.cpp lib/tokenize.h lib/token.h lib/mathlib.h lib/settings.h lib/errorlogger.h lib/check.h lib/path.h lib/symboldatabase.h
@ -261,7 +261,7 @@ test/testcharvar.o: test/testcharvar.cpp lib/tokenize.h lib/checkother.h lib/che
test/testclass.o: test/testclass.cpp lib/tokenize.h lib/checkclass.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h lib/symboldatabase.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testclass.o test/testclass.cpp
test/testcmdlineparser.o: test/testcmdlineparser.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/settings.h
test/testcmdlineparser.o: test/testcmdlineparser.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testcmdlineparser.o test/testcmdlineparser.cpp
test/testconstructors.o: test/testconstructors.cpp lib/tokenize.h lib/checkclass.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h lib/symboldatabase.h test/testsuite.h test/redirect.h
@ -279,13 +279,13 @@ test/testerrorlogger.o: test/testerrorlogger.cpp lib/cppcheck.h lib/settings.h l
test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/tokenize.h lib/checkexceptionsafety.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testexceptionsafety.o test/testexceptionsafety.cpp
test/testfilelister_unix.o: test/testfilelister_unix.cpp test/testsuite.h lib/errorlogger.h test/redirect.h
test/testfilelister_unix.o: test/testfilelister_unix.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testfilelister_unix.o test/testfilelister_unix.cpp
test/testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/tokenize.h lib/checkother.h lib/check.h lib/token.h lib/settings.h
test/testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/tokenize.h lib/checkother.h lib/check.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testincompletestatement.o test/testincompletestatement.cpp
test/testmathlib.o: test/testmathlib.cpp lib/mathlib.h test/testsuite.h lib/errorlogger.h test/redirect.h
test/testmathlib.o: test/testmathlib.cpp lib/mathlib.h test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testmathlib.o test/testmathlib.cpp
test/testmemleak.o: test/testmemleak.cpp lib/tokenize.h lib/checkmemoryleak.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h lib/symboldatabase.h test/testsuite.h test/redirect.h
@ -297,63 +297,63 @@ test/testnullpointer.o: test/testnullpointer.cpp lib/tokenize.h lib/checknullpoi
test/testobsoletefunctions.o: test/testobsoletefunctions.cpp lib/tokenize.h lib/checkobsoletefunctions.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testobsoletefunctions.o test/testobsoletefunctions.cpp
test/testoptions.o: test/testoptions.cpp test/options.h test/testsuite.h lib/errorlogger.h test/redirect.h
test/testoptions.o: test/testoptions.cpp test/options.h test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testoptions.o test/testoptions.cpp
test/testother.o: test/testother.cpp lib/tokenize.h lib/checkother.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testother.o test/testother.cpp
test/testpath.o: test/testpath.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/path.h
test/testpath.o: test/testpath.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/path.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testpath.o test/testpath.cpp
test/testpathmatch.o: test/testpathmatch.cpp test/testsuite.h lib/errorlogger.h test/redirect.h
test/testpathmatch.o: test/testpathmatch.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testpathmatch.o test/testpathmatch.cpp
test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/tokenize.h lib/checkpostfixoperator.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testpostfixoperator.o test/testpostfixoperator.cpp
test/testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/preprocessor.h lib/tokenize.h lib/token.h lib/settings.h
test/testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/preprocessor.h lib/tokenize.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testpreprocessor.o test/testpreprocessor.cpp
test/testrunner.o: test/testrunner.cpp test/testsuite.h lib/errorlogger.h test/redirect.h test/options.h
test/testrunner.o: test/testrunner.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h test/options.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testrunner.o test/testrunner.cpp
test/testsettings.o: test/testsettings.cpp lib/settings.h test/testsuite.h lib/errorlogger.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsettings.o test/testsettings.cpp
test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/tokenize.h lib/token.h lib/settings.h
test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/tokenize.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp
test/teststl.o: test/teststl.cpp lib/tokenize.h lib/checkstl.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/teststl.o test/teststl.cpp
test/testsuite.o: test/testsuite.cpp test/testsuite.h lib/errorlogger.h test/redirect.h test/options.h
test/testsuite.o: test/testsuite.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h test/options.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsuite.o test/testsuite.cpp
test/testsuppressions.o: test/testsuppressions.cpp test/testsuite.h lib/cppcheck.h lib/settings.h lib/errorlogger.h cli/threadexecutor.h
test/testsuppressions.o: test/testsuppressions.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsuppressions.o test/testsuppressions.cpp
test/testsymboldatabase.o: test/testsymboldatabase.cpp test/testsuite.h lib/errorlogger.h test/redirect.h test/testutils.h lib/settings.h lib/tokenize.h lib/token.h lib/symboldatabase.h
test/testsymboldatabase.o: test/testsymboldatabase.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h test/testutils.h lib/tokenize.h lib/token.h lib/symboldatabase.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsymboldatabase.o test/testsymboldatabase.cpp
test/testthreadexecutor.o: test/testthreadexecutor.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testthreadexecutor.o test/testthreadexecutor.cpp
test/testtoken.o: test/testtoken.cpp test/testsuite.h lib/errorlogger.h test/redirect.h test/testutils.h lib/settings.h lib/tokenize.h lib/token.h
test/testtoken.o: test/testtoken.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h test/testutils.h lib/tokenize.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testtoken.o test/testtoken.cpp
test/testtokenize.o: test/testtokenize.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/tokenize.h lib/token.h lib/settings.h
test/testtokenize.o: test/testtokenize.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/tokenize.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testtokenize.o test/testtokenize.cpp
test/testuninitvar.o: test/testuninitvar.cpp lib/tokenize.h lib/checkuninitvar.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testuninitvar.o test/testuninitvar.cpp
test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/tokenize.h test/testsuite.h lib/errorlogger.h test/redirect.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/settings.h
test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/tokenize.h test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/checkunusedfunctions.h lib/check.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testunusedfunctions.o test/testunusedfunctions.cpp
test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/tokenize.h lib/checkclass.h lib/check.h lib/token.h lib/settings.h lib/errorlogger.h lib/symboldatabase.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testunusedprivfunc.o test/testunusedprivfunc.cpp
test/testunusedvar.o: test/testunusedvar.cpp test/testsuite.h lib/errorlogger.h test/redirect.h lib/tokenize.h lib/checkother.h lib/check.h lib/token.h lib/settings.h
test/testunusedvar.o: test/testunusedvar.cpp test/testsuite.h lib/errorlogger.h lib/settings.h test/redirect.h lib/tokenize.h lib/checkother.h lib/check.h lib/token.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testunusedvar.o test/testunusedvar.cpp

View File

@ -18,82 +18,82 @@
<CfgParent>Base</CfgParent>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<OutputExt>exe</OutputExt>
<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
<BCC_wamb>true</BCC_wamb>
<Defines>NO_STRICT</Defines>
<OutputExt>exe</OutputExt>
<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
<BCC_wexc>true</BCC_wexc>
<Defines>NO_STRICT</Defines>
<BCC_wamb>true</BCC_wamb>
<BCC_wprc>true</BCC_wprc>
<BCC_wnod>true</BCC_wnod>
<BCC_wexc>true</BCC_wexc>
<DynamicRTL>true</DynamicRTL>
<BCC_wnod>true</BCC_wnod>
<BCC_wuse>true</BCC_wuse>
<BCC_wdef>true</BCC_wdef>
<BCC_wbbf>true</BCC_wbbf>
<BCC_wdef>true</BCC_wdef>
<BCC_wsig>true</BCC_wsig>
<ILINK_SelectedWarnings>false</ILINK_SelectedWarnings>
<BCC_wnak>true</BCC_wnak>
<ILINK_ObjectSearchPath>C:\cppcheck;src;cli;lib;externals\tinyxml</ILINK_ObjectSearchPath>
<ILINK_AllWarnings>true</ILINK_AllWarnings>
<BCC_wstl>true</BCC_wstl>
<BCC_winl>true</BCC_winl>
<NoVCL>true</NoVCL>
<ILINK_ObjectSearchPath>C:\cppcheck;src;cli;lib;externals\tinyxml</ILINK_ObjectSearchPath>
<BCC_wnak>true</BCC_wnak>
<ProjectType>CppConsoleApplication</ProjectType>
<BCC_wasm>true</BCC_wasm>
<NoVCL>true</NoVCL>
<BCC_winl>true</BCC_winl>
<BCC_wstl>true</BCC_wstl>
<FinalOutputDir>.\</FinalOutputDir>
<BCC_wpin>true</BCC_wpin>
<BCC_wasm>true</BCC_wasm>
<BCC_wcln>true</BCC_wcln>
<PackageImports>vcl.bpi;rtl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;vcldbx.bpi;bdertl.bpi;A407_R110.bpi;DreamEdit_C6.bpi</PackageImports>
<BCC_wpin>true</BCC_wpin>
<DCC_UNSAFE_CAST>true</DCC_UNSAFE_CAST>
<BCC_wimp>true</BCC_wimp>
<BCC_wucp>true</BCC_wucp>
<PackageImports>vcl.bpi;rtl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;vcldbx.bpi;bdertl.bpi;A407_R110.bpi;DreamEdit_C6.bpi</PackageImports>
<BCC_wamp>true</BCC_wamp>
<BCC_wstu>true</BCC_wstu>
<BCC_wucp>true</BCC_wucp>
<BCC_wimp>true</BCC_wimp>
<IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;cli;lib;externals;externals\tinyxml</IncludePath>
<BCC_wstu>true</BCC_wstu>
<BCC_wstv>true</BCC_wstv>
<ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib;externals\tinyxml</ILINK_LibraryPath>
<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
<DCC_UNSAFE_CODE>true</DCC_UNSAFE_CODE>
<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_Optimize>false</DCC_Optimize>
<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
<BCC_wamb>true</BCC_wamb>
<Defines>_DEBUG;_HAS_ITERATOR_DEBUGGING=1;$(Defines)</Defines>
<DCC_Optimize>false</DCC_Optimize>
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
<BCC_wexc>true</BCC_wexc>
<Defines>_DEBUG;_HAS_ITERATOR_DEBUGGING=1;$(Defines)</Defines>
<BCC_wamb>true</BCC_wamb>
<BCC_wprc>true</BCC_wprc>
<BCC_wnod>true</BCC_wnod>
<BCC_wexc>true</BCC_wexc>
<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
<BCC_wnod>true</BCC_wnod>
<BCC_wuse>true</BCC_wuse>
<BCC_wdef>true</BCC_wdef>
<BCC_wbbf>true</BCC_wbbf>
<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
<BCC_wbbf>true</BCC_wbbf>
<BCC_wdef>true</BCC_wdef>
<BCC_wsig>true</BCC_wsig>
<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
<DCC_Define>DEBUG</DCC_Define>
<BCC_wnak>true</BCC_wnak>
<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
<BCC_wstl>true</BCC_wstl>
<BCC_wnak>true</BCC_wnak>
<BCC_winl>true</BCC_winl>
<BCC_wasm>true</BCC_wasm>
<FinalOutputDir>.\</FinalOutputDir>
<BCC_wstl>true</BCC_wstl>
<BCC_SelectedWarnings>true</BCC_SelectedWarnings>
<BCC_wpin>true</BCC_wpin>
<FinalOutputDir>.\</FinalOutputDir>
<BCC_wasm>true</BCC_wasm>
<BCC_wcln>true</BCC_wcln>
<BCC_wpin>true</BCC_wpin>
<IntermediateOutputDir>bcb_Debug</IntermediateOutputDir>
<BCC_wimp>true</BCC_wimp>
<BCC_wucp>true</BCC_wucp>
<BCC_wamp>true</BCC_wamp>
<BCC_wucp>true</BCC_wucp>
<BCC_wimp>true</BCC_wimp>
<BCC_AllWarnings>false</BCC_AllWarnings>
<BCC_wpar>true</BCC_wpar>
<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
<BCC_wpar>true</BCC_wpar>
<BCC_StackFrames>true</BCC_StackFrames>
<BCC_wstu>true</BCC_wstu>
<BCC_wstv>true</BCC_wstv>
<ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
<ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<TASM_Debugging>Full</TASM_Debugging>
<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
</PropertyGroup>
@ -113,133 +113,123 @@
<Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
<Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1053</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams">applicom.c</Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD">C:\linux-2.6.25.1\drivers\char</Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;cli;lib;externals</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src;cli;lib</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src</HistoryLists_hlIncludePath> <HistoryLists_hlIncludePath Name="Item3">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck</HistoryLists_hlIncludePath>
</HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib;externals\tinyxml</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Count">3</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item0">.\</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item1">bcb_debug</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item2">.</HistoryLists_hlFinalOutputDir></HistoryLists_hlFinalOutputDir><HistoryLists_hlBCC_MaxIdentifierLength><HistoryLists_hlBCC_MaxIdentifierLength Name="Count">1</HistoryLists_hlBCC_MaxIdentifierLength><HistoryLists_hlBCC_MaxIdentifierLength Name="Item0">250</HistoryLists_hlBCC_MaxIdentifierLength></HistoryLists_hlBCC_MaxIdentifierLength></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1053</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams">applicom.c</Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD">C:\linux-2.6.25.1\drivers\char</Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;cli;lib;externals</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src;cli;lib</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item3">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib;externals\tinyxml</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Count">3</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item0">.\</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item1">bcb_debug</HistoryLists_hlFinalOutputDir><HistoryLists_hlFinalOutputDir Name="Item2">.</HistoryLists_hlFinalOutputDir></HistoryLists_hlFinalOutputDir><HistoryLists_hlBCC_MaxIdentifierLength><HistoryLists_hlBCC_MaxIdentifierLength Name="Count">1</HistoryLists_hlBCC_MaxIdentifierLength><HistoryLists_hlBCC_MaxIdentifierLength Name="Item0">250</HistoryLists_hlBCC_MaxIdentifierLength></HistoryLists_hlBCC_MaxIdentifierLength></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
<ItemGroup>
<CppCompile Include="cli\cmdlineparser.cpp">
<BuildOrder>27</BuildOrder>
<BuildOrder>0</BuildOrder>
</CppCompile>
<CppCompile Include="cli\cppcheckexecutor.cpp">
<BuildOrder>28</BuildOrder>
<BuildOrder>1</BuildOrder>
</CppCompile>
<CppCompile Include="cli\filelister.cpp">
<DependentOn>cli\filelister.h</DependentOn>
<BuildOrder>2</BuildOrder>
</CppCompile>
<CppCompile Include="cli\filelister_unix.cpp">
<BuildOrder>3</BuildOrder>
</CppCompile>
<CppCompile Include="cli\filelister_win32.cpp">
<BuildOrder>4</BuildOrder>
</CppCompile>
<CppCompile Include="cli\main.cpp">
<BuildOrder>29</BuildOrder>
<BuildOrder>5</BuildOrder>
</CppCompile>
<CppCompile Include="cli\pathmatch.cpp">
<BuildOrder>6</BuildOrder>
</CppCompile>
<CppCompile Include="cli\threadexecutor.cpp">
<BuildOrder>26</BuildOrder>
</CppCompile>
<CppCompile Include="externals\tinyxml\tinystr.cpp">
<BuildOrder>30</BuildOrder>
</CppCompile>
<CppCompile Include="externals\tinyxml\tinyxml.cpp">
<BuildOrder>31</BuildOrder>
</CppCompile>
<CppCompile Include="externals\tinyxml\tinyxmlerror.cpp">
<BuildOrder>32</BuildOrder>
</CppCompile>
<CppCompile Include="externals\tinyxml\tinyxmlparser.cpp">
<BuildOrder>33</BuildOrder>
<BuildOrder>7</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkautovariables.cpp">
<DependentOn>lib\checkautovariables.h</DependentOn>
<BuildOrder>0</BuildOrder>
<BuildOrder>8</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkbufferoverrun.cpp">
<DependentOn>lib\checkbufferoverrun.h</DependentOn>
<BuildOrder>1</BuildOrder>
<BuildOrder>9</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkclass.cpp">
<DependentOn>lib\checkclass.h</DependentOn>
<BuildOrder>2</BuildOrder>
<BuildOrder>10</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkexceptionsafety.cpp">
<DependentOn>lib\checkexceptionsafety.h</DependentOn>
<BuildOrder>3</BuildOrder>
<BuildOrder>11</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkmemoryleak.cpp">
<DependentOn>lib\checkmemoryleak.h</DependentOn>
<BuildOrder>4</BuildOrder>
<BuildOrder>12</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checknullpointer.cpp">
<DependentOn>lib\checknullpointer.h</DependentOn>
<BuildOrder>5</BuildOrder>
<BuildOrder>13</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkobsoletefunctions.cpp">
<DependentOn>lib\checkobsoletefunctions.h</DependentOn>
<BuildOrder>6</BuildOrder>
<BuildOrder>14</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkother.cpp">
<DependentOn>lib\checkother.h</DependentOn>
<BuildOrder>7</BuildOrder>
<BuildOrder>15</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkpostfixoperator.cpp">
<DependentOn>lib\checkpostfixoperator.h</DependentOn>
<BuildOrder>8</BuildOrder>
<BuildOrder>16</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkstl.cpp">
<DependentOn>lib\checkstl.h</DependentOn>
<BuildOrder>9</BuildOrder>
<BuildOrder>17</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkuninitvar.cpp">
<DependentOn>lib\checkuninitvar.h</DependentOn>
<BuildOrder>10</BuildOrder>
<BuildOrder>18</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkunusedfunctions.cpp">
<DependentOn>lib\checkunusedfunctions.h</DependentOn>
<BuildOrder>11</BuildOrder>
<BuildOrder>19</BuildOrder>
</CppCompile>
<CppCompile Include="lib\cppcheck.cpp">
<BuildOrder>12</BuildOrder>
<BuildOrder>20</BuildOrder>
</CppCompile>
<CppCompile Include="lib\errorlogger.cpp">
<DependentOn>lib\errorlogger.h</DependentOn>
<BuildOrder>13</BuildOrder>
<BuildOrder>21</BuildOrder>
</CppCompile>
<CppCompile Include="lib\executionpath.cpp">
<DependentOn>lib\executionpath.h</DependentOn>
<BuildOrder>14</BuildOrder>
</CppCompile>
<CppCompile Include="lib\filelister.cpp">
<DependentOn>lib\filelister.h</DependentOn>
<BuildOrder>15</BuildOrder>
</CppCompile>
<CppCompile Include="lib\filelister_unix.cpp">
<BuildOrder>16</BuildOrder>
</CppCompile>
<CppCompile Include="lib\filelister_win32.cpp">
<BuildOrder>17</BuildOrder>
<BuildOrder>22</BuildOrder>
</CppCompile>
<CppCompile Include="lib\mathlib.cpp">
<DependentOn>lib\mathlib.h</DependentOn>
<BuildOrder>18</BuildOrder>
<BuildOrder>23</BuildOrder>
</CppCompile>
<CppCompile Include="lib\path.cpp">
<BuildOrder>19</BuildOrder>
<BuildOrder>24</BuildOrder>
</CppCompile>
<CppCompile Include="lib\preprocessor.cpp">
<DependentOn>lib\preprocessor.h</DependentOn>
<BuildOrder>20</BuildOrder>
<BuildOrder>25</BuildOrder>
</CppCompile>
<CppCompile Include="lib\settings.cpp">
<DependentOn>lib\settings.h</DependentOn>
<BuildOrder>21</BuildOrder>
<BuildOrder>26</BuildOrder>
</CppCompile>
<CppCompile Include="lib\symboldatabase.cpp">
<DependentOn>lib\symboldatabase.h</DependentOn>
<BuildOrder>22</BuildOrder>
<BuildOrder>27</BuildOrder>
</CppCompile>
<CppCompile Include="lib\timer.cpp">
<BuildOrder>23</BuildOrder>
<BuildOrder>28</BuildOrder>
</CppCompile>
<CppCompile Include="lib\token.cpp">
<DependentOn>lib\token.h</DependentOn>
<BuildOrder>24</BuildOrder>
<BuildOrder>29</BuildOrder>
</CppCompile>
<CppCompile Include="lib\tokenize.cpp">
<DependentOn>lib\tokenize.h</DependentOn>
<BuildOrder>25</BuildOrder>
<BuildOrder>30</BuildOrder>
</CppCompile>
<BuildConfiguration Include="Debug">
<Key>Cfg_1</Key>

View File

@ -554,7 +554,7 @@ void CheckNullPointer::nullPointerByCheckAndDeRef()
{
// goto the end paranthesis
const Token *endpar = tok->next()->link();
const Token *endbody = endpar ? endpar->next()->link() : 0;
const Token *endbody = Token::simpleMatch(endpar, ") {") ? endpar->next()->link() : 0;
if (endbody &&
Token::Match(endbody->tokAt(-3), "[;{}] %var% ;") &&
isUpper(endbody->tokAt(-2)->str()))

View File

@ -73,10 +73,10 @@ void CheckOther::clarifyCalculation()
return;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{
if (tok->str() == "?")
if (tok->strAt(1) == "?")
{
// condition
const Token *cond = tok->previous();
const Token *cond = tok;
if (cond->isName() || cond->isNumber())
cond = cond->previous();
else if (cond->str() == ")")
@ -85,7 +85,7 @@ void CheckOther::clarifyCalculation()
continue;
// multiplication
if (cond->str() == "*")
if (cond && cond->str() == "*")
cond = cond->previous();
else
continue;

View File

@ -1,4 +1,4 @@
/*
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2011 Daniel Marjamäki and Cppcheck team.
*
@ -5528,6 +5528,9 @@ void Tokenizer::simplifyVarDecl()
}
}
if (!tok2)
break;
if (Token::Match(tok2, ":: %type%"))
{
typelen += 2;
@ -7684,9 +7687,9 @@ void Tokenizer::simplifyEnum()
// find all uses of this enumerator and substitute it's value for it's name
if (enumName && (enumValue || (enumValueStart && enumValueEnd)))
{
const std::string pattern(className.empty() ?
const std::string pattern = className.empty() ?
std::string("") :
(className + " :: " + enumName->str()));
std::string(className + " :: " + enumName->str());
int level = 1;
bool inScope = true;

View File

@ -890,6 +890,9 @@ private:
" };\n"
"}");
ASSERT_EQUALS("", errout.str());
// #2582 - segmentation fault
check("if()");
}
// Test CheckNullPointer::nullConstantDereference

View File

@ -1865,6 +1865,12 @@ private:
" printf(\"%i\", 10 * (c == 0) ? 1 : 2);\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (information) Please clarify precedence: 'a*b?..'\n", errout.str());
// Ticket #2585 - segmentation fault for invalid code
check("abcdef?" "?<"
"123456?" "?>"
"+?" "?=");
ASSERT_EQUALS("", errout.str());
}
void incorrectStringCompare()

View File

@ -191,7 +191,8 @@ private:
void suppressionsMultiFile()
{
const char *names[] = {"abc.cpp", "xyz.cpp", NULL};
const char *codes[] = {
const char *codes[] =
{
"void f() {\n"
"}\n",
"void f() {\n"

View File

@ -234,7 +234,8 @@ private:
TEST_CASE(vardecl_union);
TEST_CASE(volatile_variables);
TEST_CASE(syntax_error);
TEST_CASE(syntax_error_templates);
TEST_CASE(syntax_error_templates_1);
TEST_CASE(syntax_error_templates_2);
TEST_CASE(removeKeywords);
@ -4165,7 +4166,7 @@ private:
}
void syntax_error_templates()
void syntax_error_templates_1()
{
// ok code.. using ">" for a comparison
{
@ -4235,6 +4236,14 @@ private:
}
}
void syntax_error_templates_2()
{
std::istringstream istr("template<>\n");
Settings settings;
Tokenizer tokenizer(&settings, this);
tokenizer.tokenize(istr, "test.cpp"); // shouldn't segfault
}
void removeKeywords()
{
const char code[] = "if (__builtin_expect(!!(x), 1));";

View File

@ -232,6 +232,7 @@ int main(int argc, char **argv)
// TODO: add more compiler warnings.
// -Wlogical-op : doesn't work on older GCC
// -Wconversion : too many warnings
// -Wsign-conversion : too many warnings
// The _GLIBCXX_DEBUG doesn't work in cygwin
makeConditionalVariable(fout, "CXXFLAGS",
@ -243,7 +244,7 @@ int main(int argc, char **argv)
"-Wno-long-long "
"-Wfloat-equal "
"-Wcast-qual "
"-Wsign-conversion "
// "-Wsign-conversion "
// "-Wconversion "
"-g");
}