Skip to content

Commit

Permalink
tabs to spaces, remove trailing spaces and extra empty lines at the e…
Browse files Browse the repository at this point in the history
…nd of files
  • Loading branch information
XhmikosR authored and PKEuS committed Sep 29, 2012
1 parent 5101243 commit 9b5c245
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 84 deletions.
1 change: 0 additions & 1 deletion build-pcre.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ Install pcre:
Ensure /path/to/pcre.h is in CXXFLAGS, e.g:

export CXXFLAGS=${CXXFLAGS}:/opt/local/include

1 change: 0 additions & 1 deletion createrelease
Original file line number Diff line number Diff line change
Expand Up @@ -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/

9 changes: 4 additions & 5 deletions democlient/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!

2 changes: 1 addition & 1 deletion htdocs/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@
</div> <!-- .wrap -->
</div> <!-- #content -->
</body>
</html>
</html>
108 changes: 54 additions & 54 deletions htmlreport/cppcheck-htmlreport
Original file line number Diff line number Diff line change
Expand Up @@ -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;
border-bottom-style: solid;
border-bottom-width: thin;
border-bottom-color: #aaaaaa;
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;
}
#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%;
}
"""

Expand Down
1 change: 0 additions & 1 deletion man/buildman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,3 @@ If you want to use --rule and --rule-file then dependencies are needed:
## Webpage ##

http://cppcheck.sourceforge.net/

1 change: 0 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,3 @@ Cross compiling Win32 (CLI) version of Cppcheck in Linux
Webpage

http://cppcheck.sourceforge.net/

1 change: 0 additions & 1 deletion readme_gui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

18 changes: 9 additions & 9 deletions rules/token-matching.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
<rule version="1">
<pattern>(?U)Token :: Match \([^,]+,\s+"[^%|!\[\]]+"</pattern>
<message>
<id>UseTokensimpleMatch</id>
<severity>error</severity>
<summary>Token::simpleMatch should be used to match tokens
<id>UseTokensimpleMatch</id>
<severity>error</severity>
<summary>Token::simpleMatch should be used to match tokens
without special pattern requirements.</summary>
</message>
</rule>
<rule version="1">
<pattern>\b[\w_]+ \. tokAt \( 0 \)</pattern>
<message>
<id>TokentokAt0</id>
<severity>error</severity>
<summary>tok->tokAt(0) is a slow way to say tok.</summary>
<id>TokentokAt0</id>
<severity>error</severity>
<summary>tok->tokAt(0) is a slow way to say tok.</summary>
</message>
</rule>
<rule version="1">
<pattern>\b[\w_]+ \. strAt \( 0 \)</pattern>
<message>
<id>TokenstrAt0</id>
<severity>error</severity>
<summary>tok->strAt(0) is a slow way to say tok->str()</summary>
<id>TokenstrAt0</id>
<severity>error</severity>
<summary>tok->strAt(0) is a slow way to say tok->str()</summary>
</message>
</rule>
7 changes: 3 additions & 4 deletions runastyle
Original file line number Diff line number Diff line change
@@ -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).
Expand All @@ -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"
Expand All @@ -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"

7 changes: 3 additions & 4 deletions tools/extracttests.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def parseFile(self,filename):
if res != None:
testclass = res.group(1)

# end of testclass
# end of testclass
if re.match('};', line) != None:
testclass = None

Expand Down Expand Up @@ -230,8 +230,8 @@ def writeHtmlFile(nodes, functionName, filename, errorsOnly):

# 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,
Expand Down Expand Up @@ -278,4 +278,3 @@ def writeHtmlFile(nodes, functionName, filename, errorsOnly):
else:
for node in e.nodes:
print node['functionName']

1 change: 0 additions & 1 deletion webreport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9b5c245

Please sign in to comment.