walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Borland C++: Fixed compiler errors

This commit is contained in:
Daniel Marjamäki 2010-12-31 10:24:51 +01:00
parent d8f241e033
commit f1f1a21c23
5 changed files with 115 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
cppcheck.cbproj
View File

@ -18,82 +18,82 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="'$(Base)'!=''">
<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
<OutputExt>exe</OutputExt> <OutputExt>exe</OutputExt>
<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput> <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
<Defines>NO_STRICT</Defines>
<BCC_wamb>true</BCC_wamb> <BCC_wamb>true</BCC_wamb>
<BCC_wprc>true</BCC_wprc> <Defines>NO_STRICT</Defines>
<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
<BCC_wexc>true</BCC_wexc> <BCC_wexc>true</BCC_wexc>
<DynamicRTL>true</DynamicRTL> <BCC_wprc>true</BCC_wprc>
<BCC_wnod>true</BCC_wnod> <BCC_wnod>true</BCC_wnod>
<DynamicRTL>true</DynamicRTL>
<BCC_wuse>true</BCC_wuse> <BCC_wuse>true</BCC_wuse>
<BCC_wbbf>true</BCC_wbbf>
<BCC_wdef>true</BCC_wdef> <BCC_wdef>true</BCC_wdef>
<BCC_wbbf>true</BCC_wbbf>
<BCC_wsig>true</BCC_wsig> <BCC_wsig>true</BCC_wsig>
<ILINK_SelectedWarnings>false</ILINK_SelectedWarnings> <ILINK_SelectedWarnings>false</ILINK_SelectedWarnings>
<ILINK_AllWarnings>true</ILINK_AllWarnings>
<ILINK_ObjectSearchPath>C:\cppcheck;src;cli;lib</ILINK_ObjectSearchPath>
<BCC_wnak>true</BCC_wnak> <BCC_wnak>true</BCC_wnak>
<ProjectType>CppConsoleApplication</ProjectType> <ILINK_ObjectSearchPath>C:\cppcheck;src;cli;lib;externals\tinyxml</ILINK_ObjectSearchPath>
<NoVCL>true</NoVCL> <ILINK_AllWarnings>true</ILINK_AllWarnings>
<BCC_winl>true</BCC_winl>
<BCC_wstl>true</BCC_wstl> <BCC_wstl>true</BCC_wstl>
<FinalOutputDir>.\</FinalOutputDir> <BCC_winl>true</BCC_winl>
<NoVCL>true</NoVCL>
<ProjectType>CppConsoleApplication</ProjectType>
<BCC_wasm>true</BCC_wasm> <BCC_wasm>true</BCC_wasm>
<BCC_wcln>true</BCC_wcln> <FinalOutputDir>.\</FinalOutputDir>
<BCC_wpin>true</BCC_wpin> <BCC_wpin>true</BCC_wpin>
<DCC_UNSAFE_CAST>true</DCC_UNSAFE_CAST> <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> <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> <DCC_UNSAFE_CAST>true</DCC_UNSAFE_CAST>
<BCC_wucp>true</BCC_wucp>
<BCC_wimp>true</BCC_wimp> <BCC_wimp>true</BCC_wimp>
<IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src;cli;lib</IncludePath> <BCC_wucp>true</BCC_wucp>
<BCC_wamp>true</BCC_wamp>
<BCC_wstu>true</BCC_wstu> <BCC_wstu>true</BCC_wstu>
<IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;cli;lib;externals;externals\tinyxml</IncludePath>
<BCC_wstv>true</BCC_wstv> <BCC_wstv>true</BCC_wstv>
<ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib</ILINK_LibraryPath> <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib;externals\tinyxml</ILINK_LibraryPath>
<DCC_UNSAFE_CODE>true</DCC_UNSAFE_CODE>
<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE> <DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
<DCC_UNSAFE_CODE>true</DCC_UNSAFE_CODE>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''"> <PropertyGroup Condition="'$(Cfg_1)'!=''">
<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe> <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
<Defines>_DEBUG;_HAS_ITERATOR_DEBUGGING=1;$(Defines)</Defines>
<BCC_wamb>true</BCC_wamb> <BCC_wamb>true</BCC_wamb>
<BCC_wprc>true</BCC_wprc> <Defines>_DEBUG;_HAS_ITERATOR_DEBUGGING=1;$(Defines)</Defines>
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
<BCC_wexc>true</BCC_wexc> <BCC_wexc>true</BCC_wexc>
<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo> <BCC_wprc>true</BCC_wprc>
<BCC_wnod>true</BCC_wnod> <BCC_wnod>true</BCC_wnod>
<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
<BCC_wuse>true</BCC_wuse> <BCC_wuse>true</BCC_wuse>
<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
<BCC_wbbf>true</BCC_wbbf>
<BCC_wdef>true</BCC_wdef> <BCC_wdef>true</BCC_wdef>
<BCC_wbbf>true</BCC_wbbf>
<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
<BCC_wsig>true</BCC_wsig> <BCC_wsig>true</BCC_wsig>
<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking> <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables> <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
<DCC_Define>DEBUG</DCC_Define> <DCC_Define>DEBUG</DCC_Define>
<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
<BCC_wnak>true</BCC_wnak> <BCC_wnak>true</BCC_wnak>
<BCC_winl>true</BCC_winl> <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
<BCC_wstl>true</BCC_wstl> <BCC_wstl>true</BCC_wstl>
<BCC_SelectedWarnings>true</BCC_SelectedWarnings> <BCC_winl>true</BCC_winl>
<FinalOutputDir>.\</FinalOutputDir>
<BCC_wasm>true</BCC_wasm> <BCC_wasm>true</BCC_wasm>
<BCC_wcln>true</BCC_wcln> <FinalOutputDir>.\</FinalOutputDir>
<BCC_SelectedWarnings>true</BCC_SelectedWarnings>
<BCC_wpin>true</BCC_wpin> <BCC_wpin>true</BCC_wpin>
<BCC_wcln>true</BCC_wcln>
<IntermediateOutputDir>bcb_Debug</IntermediateOutputDir> <IntermediateOutputDir>bcb_Debug</IntermediateOutputDir>
<BCC_wamp>true</BCC_wamp>
<BCC_wucp>true</BCC_wucp>
<BCC_wimp>true</BCC_wimp> <BCC_wimp>true</BCC_wimp>
<BCC_wucp>true</BCC_wucp>
<BCC_wamp>true</BCC_wamp>
<BCC_AllWarnings>false</BCC_AllWarnings> <BCC_AllWarnings>false</BCC_AllWarnings>
<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
<BCC_wpar>true</BCC_wpar> <BCC_wpar>true</BCC_wpar>
<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
<BCC_StackFrames>true</BCC_StackFrames> <BCC_StackFrames>true</BCC_StackFrames>
<BCC_wstu>true</BCC_wstu> <BCC_wstu>true</BCC_wstu>
<BCC_wstv>true</BCC_wstv> <BCC_wstv>true</BCC_wstv>
<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
<ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath> <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
<TASM_Debugging>Full</TASM_Debugging> <TASM_Debugging>Full</TASM_Debugging>
<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn> <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
</PropertyGroup> </PropertyGroup>
@ -113,49 +113,77 @@
<Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality> <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
<Borland.ProjectType>CppConsoleApplication</Borland.ProjectType> <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
<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">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src;cli;lib</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck;src</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;C:\cppcheck</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">2</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib\debug;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;C:\cppcheck;src;cli;lib</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">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">_DEBUG;NO_STRICT;_HAS_ITERATOR_DEBUGGING=1</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><HistoryLists_hlIntermediateOutputDir><HistoryLists_hlIntermediateOutputDir Name="Count">1</HistoryLists_hlIntermediateOutputDir><HistoryLists_hlIntermediateOutputDir Name="Item0">bcb_Debug</HistoryLists_hlIntermediateOutputDir></HistoryLists_hlIntermediateOutputDir></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> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
<ItemGroup> <ItemGroup>
<CppCompile Include="cli\cmdlineparser.cpp">
<BuildOrder>27</BuildOrder>
</CppCompile>
<CppCompile Include="cli\cppcheckexecutor.cpp"> <CppCompile Include="cli\cppcheckexecutor.cpp">
<BuildOrder>0</BuildOrder> <BuildOrder>28</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="cli\main.cpp"> <CppCompile Include="cli\main.cpp">
<BuildOrder>1</BuildOrder> <BuildOrder>29</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="cli\threadexecutor.cpp"> <CppCompile Include="cli\threadexecutor.cpp">
<BuildOrder>2</BuildOrder> <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>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkautovariables.cpp"> <CppCompile Include="lib\checkautovariables.cpp">
<DependentOn>lib\checkautovariables.h</DependentOn> <DependentOn>lib\checkautovariables.h</DependentOn>
<BuildOrder>3</BuildOrder> <BuildOrder>0</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkbufferoverrun.cpp"> <CppCompile Include="lib\checkbufferoverrun.cpp">
<DependentOn>lib\checkbufferoverrun.h</DependentOn> <DependentOn>lib\checkbufferoverrun.h</DependentOn>
<BuildOrder>4</BuildOrder> <BuildOrder>1</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkclass.cpp"> <CppCompile Include="lib\checkclass.cpp">
<DependentOn>lib\checkclass.h</DependentOn> <DependentOn>lib\checkclass.h</DependentOn>
<BuildOrder>5</BuildOrder> <BuildOrder>2</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkdangerousfunctions.cpp">
<DependentOn>lib\checkdangerousfunctions.h</DependentOn>
<BuildOrder>6</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkexceptionsafety.cpp"> <CppCompile Include="lib\checkexceptionsafety.cpp">
<DependentOn>lib\checkexceptionsafety.h</DependentOn> <DependentOn>lib\checkexceptionsafety.h</DependentOn>
<BuildOrder>7</BuildOrder> <BuildOrder>3</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkmemoryleak.cpp"> <CppCompile Include="lib\checkmemoryleak.cpp">
<DependentOn>lib\checkmemoryleak.h</DependentOn> <DependentOn>lib\checkmemoryleak.h</DependentOn>
<BuildOrder>8</BuildOrder> <BuildOrder>4</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checknullpointer.cpp">
<DependentOn>lib\checknullpointer.h</DependentOn>
<BuildOrder>5</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkobsoletefunctions.cpp">
<DependentOn>lib\checkobsoletefunctions.h</DependentOn>
<BuildOrder>6</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkother.cpp"> <CppCompile Include="lib\checkother.cpp">
<DependentOn>lib\checkother.h</DependentOn> <DependentOn>lib\checkother.h</DependentOn>
<BuildOrder>9</BuildOrder> <BuildOrder>7</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkpostfixoperator.cpp">
<DependentOn>lib\checkpostfixoperator.h</DependentOn>
<BuildOrder>8</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkstl.cpp"> <CppCompile Include="lib\checkstl.cpp">
<DependentOn>lib\checkstl.h</DependentOn> <DependentOn>lib\checkstl.h</DependentOn>
<BuildOrder>9</BuildOrder>
</CppCompile>
<CppCompile Include="lib\checkuninitvar.cpp">
<DependentOn>lib\checkuninitvar.h</DependentOn>
<BuildOrder>10</BuildOrder> <BuildOrder>10</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\checkunusedfunctions.cpp"> <CppCompile Include="lib\checkunusedfunctions.cpp">
@ -198,13 +226,20 @@
<DependentOn>lib\settings.h</DependentOn> <DependentOn>lib\settings.h</DependentOn>
<BuildOrder>21</BuildOrder> <BuildOrder>21</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\symboldatabase.cpp">
<DependentOn>lib\symboldatabase.h</DependentOn>
<BuildOrder>22</BuildOrder>
</CppCompile>
<CppCompile Include="lib\timer.cpp">
<BuildOrder>23</BuildOrder>
</CppCompile>
<CppCompile Include="lib\token.cpp"> <CppCompile Include="lib\token.cpp">
<DependentOn>lib\token.h</DependentOn> <DependentOn>lib\token.h</DependentOn>
<BuildOrder>22</BuildOrder> <BuildOrder>24</BuildOrder>
</CppCompile> </CppCompile>
<CppCompile Include="lib\tokenize.cpp"> <CppCompile Include="lib\tokenize.cpp">
<DependentOn>lib\tokenize.h</DependentOn> <DependentOn>lib\tokenize.h</DependentOn>
<BuildOrder>23</BuildOrder> <BuildOrder>25</BuildOrder>
</CppCompile> </CppCompile>
<BuildConfiguration Include="Debug"> <BuildConfiguration Include="Debug">
<Key>Cfg_1</Key> <Key>Cfg_1</Key>

36
cppcheck.sln
View File

@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008 # Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{BA98E531-D8B3-39CB-8171-064854404B81}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{E690724D-4286-3049-8439-595D1CB80EAB}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -12,22 +12,22 @@ Global
Release-x64|Win32 = Release-x64|Win32 Release-x64|Win32 = Release-x64|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.ActiveCfg = Debug|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug|Win32.ActiveCfg = Debug|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.Build.0 = Debug|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug|Win32.Build.0 = Debug|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug-x64|Win32.Build.0 = Debug-x64|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.ActiveCfg = Release|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release|Win32.ActiveCfg = Release|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.Build.0 = Release|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release|Win32.Build.0 = Release|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release-x64|Win32.ActiveCfg = Release-x64|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release-x64|Win32.Build.0 = Release-x64|Win32 {A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release-x64|Win32.Build.0 = Release-x64|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.ActiveCfg = Debug|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Debug|Win32.ActiveCfg = Debug|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.Build.0 = Debug|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Debug|Win32.Build.0 = Debug|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Debug-x64|Win32.Build.0 = Debug-x64|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.ActiveCfg = Release|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Release|Win32.ActiveCfg = Release|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.Build.0 = Release|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Release|Win32.Build.0 = Release|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Release-x64|Win32.ActiveCfg = Release-x64|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
{BA98E531-D8B3-39CB-8171-064854404B81}.Release-x64|Win32.Build.0 = Release-x64|Win32 {E690724D-4286-3049-8439-595D1CB80EAB}.Release-x64|Win32.Build.0 = Release-x64|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

4
lib/cppcheck.cpp
View File

@ -32,8 +32,10 @@
#include <ctime> #include <ctime>
#include "timer.h" #include "timer.h"
#ifndef __BORLANDC__
#define PCRE_STATIC #define PCRE_STATIC
#include <pcre.h> #include <pcre.h>
#endif
static TimerResults S_timerResults; static TimerResults S_timerResults;
@ -301,6 +303,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
(*it)->runSimplifiedChecks(&_tokenizer, &_settings, this); (*it)->runSimplifiedChecks(&_tokenizer, &_settings, this);
} }
#ifndef __BORLANDC__
// Are there extra rules? // Are there extra rules?
if (!_settings.rules.empty()) if (!_settings.rules.empty())
{ {
@ -370,6 +373,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
} }
} }
} }
#endif
} }
Settings CppCheck::settings() const Settings CppCheck::settings() const

4
lib/symboldatabase.h
View File

@ -267,6 +267,10 @@ public:
const SpaceInfo *findVarType(const SpaceInfo *start, const Token *type) const; const SpaceInfo *findVarType(const SpaceInfo *start, const Token *type) const;
private: private:
// Needed by Borland C++:
friend class SpaceInfo;
void addFunction(SpaceInfo **info, const Token **tok, const Token *argStart); void addFunction(SpaceInfo **info, const Token **tok, const Token *argStart);
void addNewFunction(SpaceInfo **info, const Token **tok); void addNewFunction(SpaceInfo **info, const Token **tok);

6
lib/tokenize.cpp
View File

@ -6023,9 +6023,9 @@ bool Tokenizer::simplifyKnownVariables()
} }
// struct name.. // struct name..
const std::string structname(Token::Match(tok2->tokAt(-3), "[;{}] %var% .") ? const std::string structname = Token::Match(tok2->tokAt(-3), "[;{}] %var% .") ?
(tok2->strAt(-2) + " .") : std::string(tok2->strAt(-2) + " .") :
std::string("")); std::string("");
if (tok2->str() == tok2->strAt(2)) if (tok2->str() == tok2->strAt(2))
continue; continue;