diff --git a/build-pcre.txt b/build-pcre.txt index 28893a92e..cc4a39bc0 100644 --- a/build-pcre.txt +++ b/build-pcre.txt @@ -55,4 +55,3 @@ Install pcre: Ensure /path/to/pcre.h is in CXXFLAGS, e.g: export CXXFLAGS=${CXXFLAGS}:/opt/local/include - diff --git a/createrelease b/createrelease index ec16d1ede..1f168bdd0 100755 --- a/createrelease +++ b/createrelease @@ -73,4 +73,3 @@ git archive --format=tar --prefix=$releasename/ $tag | bzip2 > ~/$releasename.ta git archive --format=zip -9 --prefix=$releasename/ $tag > ~/$releasename.zip scp ../$releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$tag/ - diff --git a/democlient/build.sh b/democlient/build.sh index b0016c654..4104f1393 100755 --- a/democlient/build.sh +++ b/democlient/build.sh @@ -7,20 +7,19 @@ # cppcheck lib folder cppchecklib=cppcheck-$1/lib -echo Download.. +echo Downloading... wget https://downloads.sourceforge.net/project/cppcheck/cppcheck/$1/cppcheck-$1.tar.bz2 -echo Unpack.. +echo Unpacking... tar xjvf cppcheck-$1.tar.bz2 rm cppcheck-$1.tar.bz2 rm cppcheck-$1/Changelog -echo Building.. +echo Building... g++ -O2 -o democlient-$1.cgi -I$cppchecklib cppcheck-$1/democlient/democlient.cpp $cppchecklib/*.cpp -echo Copy cgi to webspace.. +echo Copy cgi to webspace... cp democlient-$1.cgi /home/project-web/cppcheck/cgi-bin/democlient.cgi chmod +rx /home/project-web/cppcheck/cgi-bin/democlient.cgi echo Done! - diff --git a/htdocs/index.php b/htdocs/index.php index 68e1ca4b2..a819cb75b 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -143,4 +143,4 @@ add Cppcheck as an external tool.

- + \ No newline at end of file diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport index 40424cc78..057a0c46c 100755 --- a/htmlreport/cppcheck-htmlreport +++ b/htmlreport/cppcheck-htmlreport @@ -16,104 +16,104 @@ with syntax highlighted source code. STYLE_FILE = """ body.body { - font-family: Arial; - font-size: 13px; - background-color: black; - padding: 0px; - margin: 0px; + font-family: Arial; + font-size: 13px; + background-color: black; + padding: 0px; + margin: 0px; } .error { - font-family: Arial; - font-size: 13px; - background-color: #ffb7b7; - padding: 0px; - margin: 0px; + font-family: Arial; + font-size: 13px; + background-color: #ffb7b7; + padding: 0px; + margin: 0px; } #page-header { - clear: both; - width: 900px; - margin: 20px auto 0px auto; - height: 10px; + clear: both; + width: 900px; + margin: 20px auto 0px auto; + height: 10px; border-bottom-width: 2px; border-bottom-style: solid; border-bottom-color: #aaaaaa; } #page { - width: 860px; - margin: auto; + width: 860px; + margin: auto; border-left-width: 2px; border-left-style: solid; border-left-color: #aaaaaa; border-right-width: 2px; border-right-style: solid; border-right-color: #aaaaaa; - background-color: White; - padding: 20px; + background-color: White; + padding: 20px; } #page-footer { - clear: both; - width: 900px; - margin: auto; - height: 10px; + clear: both; + width: 900px; + margin: auto; + height: 10px; border-top-width: 2px; border-top-style: solid; border-top-color: #aaaaaa; } #header { - width: 100%; - height: 70px; - background-image: url(logo.png); - background-repeat: no-repeat; - background-position: left top; + width: 100%; + height: 70px; + background-image: url(logo.png); + background-repeat: no-repeat; + background-position: left top; - border-bottom-style: solid; - border-bottom-width: thin; - border-bottom-color: #aaaaaa; + border-bottom-style: solid; + border-bottom-width: thin; + border-bottom-color: #aaaaaa; } #menu { - margin-top: 5px; - text-align: left; - float: left; - width: 100px; - height: 300px; + margin-top: 5px; + text-align: left; + float: left; + width: 100px; + height: 300px; } #menu > a { - margin-left: 10px; - display: block; + margin-left: 10px; + display: block; } #content { - float: left; - width: 720px; + float: left; + width: 720px; - margin: 5px; - padding: 0px 10px 10px 10px; + margin: 5px; + padding: 0px 10px 10px 10px; - border-left-style: solid; - border-left-width: thin; - border-left-color: #aaaaaa; + border-left-style: solid; + border-left-width: thin; + border-left-color: #aaaaaa; } #footer { - padding-bottom: 5px; - padding-top: 5px; - border-top-style: solid; - border-top-width: thin; - border-top-color: #aaaaaa; - clear: both; - font-size: 10px; + padding-bottom: 5px; + padding-top: 5px; + border-top-style: solid; + border-top-width: thin; + border-top-color: #aaaaaa; + clear: both; + font-size: 10px; } #footer > div { - float: left; - width: 33%; + float: left; + width: 33%; } """ diff --git a/man/buildman.sh b/man/buildman.sh index b656db03a..163d7835f 100755 --- a/man/buildman.sh +++ b/man/buildman.sh @@ -4,4 +4,3 @@ xsltproc -o manual.html /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.x xsltproc -o intermediate-fo-file.fo /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl manual.docbook fop -pdf manual.pdf -fo intermediate-fo-file.fo - diff --git a/readme.md b/readme.md index 5ad704258..db45bc660 100644 --- a/readme.md +++ b/readme.md @@ -92,4 +92,3 @@ If you want to use --rule and --rule-file then dependencies are needed: ## Webpage ## http://cppcheck.sourceforge.net/ - diff --git a/readme.txt b/readme.txt index 888b5b631..9acedea9d 100644 --- a/readme.txt +++ b/readme.txt @@ -80,4 +80,3 @@ Cross compiling Win32 (CLI) version of Cppcheck in Linux Webpage http://cppcheck.sourceforge.net/ - diff --git a/readme_gui.txt b/readme_gui.txt index 03a347d87..371f0401e 100644 --- a/readme_gui.txt +++ b/readme_gui.txt @@ -60,4 +60,3 @@ To update translations: To compile translations: - run lrelease gui.pro to compile .ts files to .qm files which are used by the executable. - diff --git a/rules/token-matching.xml b/rules/token-matching.xml index 3371f3496..e2fc85bde 100644 --- a/rules/token-matching.xml +++ b/rules/token-matching.xml @@ -10,25 +10,25 @@ (?U)Token :: Match \([^,]+,\s+"[^%|!\[\]]+" - UseTokensimpleMatch - error - Token::simpleMatch should be used to match tokens + UseTokensimpleMatch + error + Token::simpleMatch should be used to match tokens without special pattern requirements. \b[\w_]+ \. tokAt \( 0 \) - TokentokAt0 - error - tok->tokAt(0) is a slow way to say tok. + TokentokAt0 + error + tok->tokAt(0) is a slow way to say tok. \b[\w_]+ \. strAt \( 0 \) - TokenstrAt0 - error - tok->strAt(0) is a slow way to say tok->str() + TokenstrAt0 + error + tok->strAt(0) is a slow way to say tok->str() diff --git a/runastyle b/runastyle index 8c610835a..ee90e41c3 100755 --- a/runastyle +++ b/runastyle @@ -1,5 +1,5 @@ #!/bin/bash -# The version check in this script is used to avoid commit battles +# The version check in this script is used to avoid commit battles # between different developers that use different astyle versions as # different versions might have different output (this has happened in # the past). @@ -9,8 +9,8 @@ ASTYLE_VERSION="Artistic Style Version 2." if [[ "`astyle --version 2>&1`" != ${ASTYLE_VERSION}* ]]; then - echo "You should use: ${ASTYLE_VERSION}"; - exit 1; + echo "You should use: ${ASTYLE_VERSION}"; + exit 1; fi style="--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0" @@ -30,4 +30,3 @@ astyle $style $options test/*.h astyle $style $options tools/*.cpp astyle $style $options --recursive "samples/*.c" astyle $style $options --recursive "samples/*.cpp" - diff --git a/tools/extracttests.py b/tools/extracttests.py index ee0a24bff..3026a04cd 100755 --- a/tools/extracttests.py +++ b/tools/extracttests.py @@ -37,7 +37,7 @@ class Extract: if res != None: testclass = res.group(1) - # end of testclass + # end of testclass if re.match('};', line) != None: testclass = None @@ -230,8 +230,8 @@ if filename != None: # create files for each functionName for functionName in functionNames: - writeHtmlFile(e.nodes, - functionName, + writeHtmlFile(e.nodes, + functionName, htmldir + 'errors-' + functionName + '.htm', True) writeHtmlFile(e.nodes, @@ -278,4 +278,3 @@ if filename != None: else: for node in e.nodes: print node['functionName'] - diff --git a/webreport.sh b/webreport.sh index 78fdd1ac6..92728f079 100755 --- a/webreport.sh +++ b/webreport.sh @@ -14,4 +14,3 @@ mv doxyoutput/html devinfo/doxyoutput ~/pmd-4.2.6/bin/cpd.sh lib/ > devinfo/cpd.txt scp -r devinfo/ danielmarjamaki,cppcheck@web.sourceforge.net:/home/groups/c/cp/cppcheck/htdocs -