Skip to content

Commit a9a5dc0

Browse files
committed
Updated to AStyle 2.03, require this version
1 parent dd82817 commit a9a5dc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3743
-3743
lines changed

htdocs/archive/miniz.c

Lines changed: 3510 additions & 3510 deletions
Large diffs are not rendered by default.

htdocs/archive/webarchive.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static void unencode(const char *src, char *dest)
2929
*dest = '\0';
3030
}
3131

32-
int readdata(char * * const data, int sz)
32+
int readdata(char ** const data, int sz)
3333
{
3434
FILE *f = fopen("data.txt", "rt");
3535
if (!f)
@@ -88,7 +88,7 @@ int getversion(const char *data)
8888
return ret;
8989
}
9090

91-
void sortdata(char * * const data, int sz)
91+
void sortdata(char ** const data, int sz)
9292
{
9393
for (int i = 1; i < sz && data[i]; i++) {
9494
if (strcmp(data[i-1], data[i]) > 0) {

lib/check.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ class CPPCHECKLIB Check {
4343

4444
/** This constructor is used when running checks. */
4545
Check(const std::string &aname, const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
46-
: _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger), _name(aname)
47-
{ }
46+
: _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger), _name(aname) {
47+
}
4848

4949
virtual ~Check() {
5050
#if !defined(DJGPP) && !defined(__sun)
@@ -79,8 +79,8 @@ class CPPCHECKLIB Check {
7979
}
8080

8181
/** run checks, the token list is not simplified */
82-
virtual void runChecks(const Tokenizer *, const Settings *, ErrorLogger *)
83-
{ }
82+
virtual void runChecks(const Tokenizer *, const Settings *, ErrorLogger *) {
83+
}
8484

8585
/** run checks, the token list is simplified */
8686
virtual void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) = 0;

lib/checkassert.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
class CPPCHECKLIB CheckAssert : public Check {
3636
public:
37-
CheckAssert() : Check(myName())
38-
{}
37+
CheckAssert() : Check(myName()) {
38+
}
3939

4040
CheckAssert(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
41-
: Check(myName(), tokenizer, settings, errorLogger)
42-
{}
41+
: Check(myName(), tokenizer, settings, errorLogger) {
42+
}
4343

4444
virtual void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) {
4545
CheckAssert check(tokenizer, settings, errorLogger);

lib/checkautovariables.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ bool CheckAutoVariables::isPtrArg(const Token *tok)
4040
{
4141
const Variable *var = tok->variable();
4242

43-
return(var && var->isArgument() && var->isPointer());
43+
return (var && var->isArgument() && var->isPointer());
4444
}
4545

4646
bool CheckAutoVariables::isRefPtrArg(const Token *tok)
4747
{
4848
const Variable *var = tok->variable();
4949

50-
return(var && var->isArgument() && var->isReference() && var->isPointer());
50+
return (var && var->isArgument() && var->isReference() && var->isPointer());
5151
}
5252

5353
bool CheckAutoVariables::isNonReferenceArg(const Token *tok)
5454
{
5555
const Variable *var = tok->variable();
5656

57-
return(var && var->isArgument() && !var->isReference() && (var->isPointer() || var->typeStartToken()->isStandardType() || var->type()));
57+
return (var && var->isArgument() && !var->isReference() && (var->isPointer() || var->typeStartToken()->isStandardType() || var->type()));
5858
}
5959

6060
bool CheckAutoVariables::isAutoVar(const Token *tok)
@@ -96,7 +96,7 @@ static bool checkRvalueExpression(const Token * const vartok)
9696
return var2 && !var2->isPointer();
9797
}
9898

99-
return((next->str() != "." || (!var->isPointer() && (!var->isClass() || var->type()))) && next->strAt(2) != ".");
99+
return ((next->str() != "." || (!var->isPointer() && (!var->isClass() || var->type()))) && next->strAt(2) != ".");
100100
}
101101

102102
static bool variableIsUsedInScope(const Token* start, unsigned int varId, const Scope *scope)

lib/checkautovariables.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
class CPPCHECKLIB CheckAutoVariables : public Check {
3434
public:
3535
/** This constructor is used when registering the CheckClass */
36-
CheckAutoVariables() : Check(myName())
37-
{ }
36+
CheckAutoVariables() : Check(myName()) {
37+
}
3838

3939
/** This constructor is used when running checks. */
4040
CheckAutoVariables(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
41-
: Check(myName(), tokenizer, settings, errorLogger)
42-
{ }
41+
: Check(myName(), tokenizer, settings, errorLogger) {
42+
}
4343

4444
/** @brief Run checks against the normal token list */
4545
void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) {

lib/checkbool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ void CheckBool::bitwiseOnBooleanError(const Token *tok, const std::string &varna
111111

112112
static bool isBool(const Variable* var)
113113
{
114-
return(var && var->typeEndToken()->str() == "bool");
114+
return (var && var->typeEndToken()->str() == "bool");
115115
}
116116
static bool isNonBoolStdType(const Variable* var)
117117
{
118-
return(var && var->typeEndToken()->isStandardType() && var->typeEndToken()->str() != "bool");
118+
return (var && var->typeEndToken()->isStandardType() && var->typeEndToken()->str() != "bool");
119119
}
120120
void CheckBool::checkComparisonOfBoolWithInt()
121121
{

lib/checkbool.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ class Variable;
3939
class CPPCHECKLIB CheckBool : public Check {
4040
public:
4141
/** @brief This constructor is used when registering the CheckClass */
42-
CheckBool() : Check(myName())
43-
{ }
42+
CheckBool() : Check(myName()) {
43+
}
4444

4545
/** @brief This constructor is used when running checks. */
4646
CheckBool(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
47-
: Check(myName(), tokenizer, settings, errorLogger)
48-
{ }
47+
: Check(myName(), tokenizer, settings, errorLogger) {
48+
}
4949

5050
/** @brief Run checks against the normal token list */
5151
void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) {

lib/checkboost.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class Token;
3535
class CPPCHECKLIB CheckBoost : public Check {
3636
public:
3737
/** This constructor is used when registering the CheckClass */
38-
CheckBoost() : Check(myName())
39-
{ }
38+
CheckBoost() : Check(myName()) {
39+
}
4040

4141
/** This constructor is used when running checks. */
4242
CheckBoost(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
43-
: Check(myName(), tokenizer, settings, errorLogger)
44-
{ }
43+
: Check(myName(), tokenizer, settings, errorLogger) {
44+
}
4545

4646
/** Simplified checks. The token list is simplified. */
4747
void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) {

lib/checkbufferoverrun.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
5151
public:
5252

5353
/** This constructor is used when registering the CheckClass */
54-
CheckBufferOverrun() : Check(myName())
55-
{ }
54+
CheckBufferOverrun() : Check(myName()) {
55+
}
5656

5757
/** This constructor is used when running checks. */
5858
CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
59-
: Check(myName(), tokenizer, settings, errorLogger)
60-
{ }
59+
: Check(myName(), tokenizer, settings, errorLogger) {
60+
}
6161

6262
void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) {
6363
CheckBufferOverrun checkBufferOverrun(tokenizer, settings, errorLogger);

0 commit comments

Comments
 (0)