cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2929 from ethereum/cppcheck

Browse Source 
Another set of improvements found by cppcheck
This commit is contained in:
Alex Beregszaszi 2017-09-20 08:41:44 +01:00 committed by GitHub
commit d6bc0a0631
18 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libdevcore/SHA3.cpp
View File

@ -97,10 +97,9 @@ static const uint64_t RC[24] = \
static inline void keccakf(void* state) { static inline void keccakf(void* state) {
uint64_t* a = (uint64_t*)state; uint64_t* a = (uint64_t*)state;
uint64_t b[5] = {0}; uint64_t b[5] = {0};
uint64_t t = 0;
uint8_t x, y;
for (int i = 0; i < 24; i++) { for (int i = 0; i < 24; i++) {
uint8_t x, y;
// Theta // Theta
FOR5(x, 1, FOR5(x, 1,
b[x] = 0; b[x] = 0;
@ -110,7 +109,7 @@ static inline void keccakf(void* state) {
FOR5(y, 5, FOR5(y, 5,
a[y + x] ^= b[(x + 4) % 5] ^ rol(b[(x + 1) % 5], 1); )) a[y + x] ^= b[(x + 4) % 5] ^ rol(b[(x + 1) % 5], 1); ))
// Rho and pi // Rho and pi
t = a[1]; uint64_t t = a[1];
x = 0; x = 0;
REPEAT24(b[0] = a[pi[x]]; REPEAT24(b[0] = a[pi[x]];
a[pi[x]] = rol(t, rho[x]); a[pi[x]] = rol(t, rho[x]);

4
libdevcore/SwarmHash.h
View File

@ -26,7 +26,7 @@
namespace dev namespace dev
{ {
/// Compute the "swarm hash" of @a _data /// Compute the "swarm hash" of @a _input
h256 swarmHash(std::string const& _data); h256 swarmHash(std::string const& _input);
} }

2
libevmasm/ConstantOptimiser.h
View File

@ -91,7 +91,7 @@ protected:
} }
/// Replaces all constants i by the code given in @a _replacement[i]. /// Replaces all constants i by the code given in @a _replacement[i].
static void replaceConstants(AssemblyItems& _items, std::map<u256, AssemblyItems> const& _replacement); static void replaceConstants(AssemblyItems& _items, std::map<u256, AssemblyItems> const& _replacements);
Params m_params; Params m_params;
u256 const& m_value; u256 const& m_value;

4
libevmasm/GasMeter.cpp
View File

@ -189,9 +189,9 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
return gas; return gas;
} }
GasMeter::GasConsumption GasMeter::wordGas(u256 const& _multiplier, ExpressionClasses::Id _position) GasMeter::GasConsumption GasMeter::wordGas(u256 const& _multiplier, ExpressionClasses::Id _value)
{ {
u256 const* value = m_state->expressionClasses().knownConstant(_position); u256 const* value = m_state->expressionClasses().knownConstant(_value);
if (!value) if (!value)
return GasConsumption::infinite(); return GasConsumption::infinite();
return GasConsumption(_multiplier * ((*value + 31) / 32)); return GasConsumption(_multiplier * ((*value + 31) / 32));

16
libsolidity/analysis/DocStringAnalyser.cpp
View File

@ -38,30 +38,30 @@ bool DocStringAnalyser::analyseDocStrings(SourceUnit const& _sourceUnit)
return !m_errorOccured; return !m_errorOccured;
} }
bool DocStringAnalyser::visit(ContractDefinition const& _node) bool DocStringAnalyser::visit(ContractDefinition const& _contract)
{ {
static const set<string> validTags = set<string>{"author", "title", "dev", "notice"}; static const set<string> validTags = set<string>{"author", "title", "dev", "notice"};
parseDocStrings(_node, _node.annotation(), validTags, "contracts"); parseDocStrings(_contract, _contract.annotation(), validTags, "contracts");
return true; return true;
} }
bool DocStringAnalyser::visit(FunctionDefinition const& _node) bool DocStringAnalyser::visit(FunctionDefinition const& _function)
{ {
handleCallable(_node, _node, _node.annotation()); handleCallable(_function, _function, _function.annotation());
return true; return true;
} }
bool DocStringAnalyser::visit(ModifierDefinition const& _node) bool DocStringAnalyser::visit(ModifierDefinition const& _modifier)
{ {
handleCallable(_node, _node, _node.annotation()); handleCallable(_modifier, _modifier, _modifier.annotation());
return true; return true;
} }
bool DocStringAnalyser::visit(EventDefinition const& _node) bool DocStringAnalyser::visit(EventDefinition const& _event)
{ {
handleCallable(_node, _node, _node.annotation()); handleCallable(_event, _event, _event.annotation());
return true; return true;
} }

2
libsolidity/analysis/NameAndTypeResolver.h
View File

@ -148,7 +148,7 @@ public:
private: private:
bool visit(SourceUnit& _sourceUnit) override; bool visit(SourceUnit& _sourceUnit) override;
void endVisit(SourceUnit& _sourceUnit) override; void endVisit(SourceUnit& _sourceUnit) override;
bool visit(ImportDirective& _declaration) override; bool visit(ImportDirective& _import) override;
bool visit(ContractDefinition& _contract) override; bool visit(ContractDefinition& _contract) override;
void endVisit(ContractDefinition& _contract) override; void endVisit(ContractDefinition& _contract) override;
bool visit(StructDefinition& _struct) override; bool visit(StructDefinition& _struct) override;

4
libsolidity/analysis/PostTypeChecker.h
View File

@ -50,8 +50,8 @@ private:
virtual bool visit(ContractDefinition const& _contract) override; virtual bool visit(ContractDefinition const& _contract) override;
virtual void endVisit(ContractDefinition const& _contract) override; virtual void endVisit(ContractDefinition const& _contract) override;
virtual bool visit(VariableDeclaration const& _declaration) override; virtual bool visit(VariableDeclaration const& _variable) override;
virtual void endVisit(VariableDeclaration const& _declaration) override; virtual void endVisit(VariableDeclaration const& _variable) override;
virtual bool visit(Identifier const& _identifier) override; virtual bool visit(Identifier const& _identifier) override;

4
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -129,7 +129,7 @@ string ASTJsonConverter::sourceLocationToString(SourceLocation const& _location)
return std::to_string(_location.start) + ":" + std::to_string(length) + ":" + std::to_string(sourceIndex); return std::to_string(_location.start) + ":" + std::to_string(length) + ":" + std::to_string(sourceIndex);
} }
string ASTJsonConverter::namePathToString(std::vector<ASTString> const& _namePath) const string ASTJsonConverter::namePathToString(std::vector<ASTString> const& _namePath)
{ {
return boost::algorithm::join(_namePath, "."); return boost::algorithm::join(_namePath, ".");
} }
@ -171,7 +171,7 @@ void ASTJsonConverter::appendExpressionAttributes(
_attributes += exprAttributes; _attributes += exprAttributes;
} }
Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<assembly::Identifier const* ,InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<assembly::Identifier const* ,InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
{ {
Json::Value tuple(Json::objectValue); Json::Value tuple(Json::objectValue);
tuple["src"] = sourceLocationToString(_info.first->location); tuple["src"] = sourceLocationToString(_info.first->location);

20
libsolidity/ast/ASTJsonConverter.h
View File

@ -120,7 +120,7 @@ private:
std::vector<std::pair<std::string, Json::Value>>&& _attributes std::vector<std::pair<std::string, Json::Value>>&& _attributes
); );
std::string sourceLocationToString(SourceLocation const& _location) const; std::string sourceLocationToString(SourceLocation const& _location) const;
std::string namePathToString(std::vector<ASTString> const& _namePath) const; static std::string namePathToString(std::vector<ASTString> const& _namePath);
static Json::Value idOrNull(ASTNode const* _pt) static Json::Value idOrNull(ASTNode const* _pt)
{ {
return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue; return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue;
@ -129,13 +129,13 @@ private:
{ {
return _node ? toJson(*_node) : Json::nullValue; return _node ? toJson(*_node) : Json::nullValue;
} }
Json::Value inlineAssemblyIdentifierToJson(std::pair<assembly::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info); Json::Value inlineAssemblyIdentifierToJson(std::pair<assembly::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const;
std::string location(VariableDeclaration::Location _location); static std::string location(VariableDeclaration::Location _location);
std::string contractKind(ContractDefinition::ContractKind _kind); static std::string contractKind(ContractDefinition::ContractKind _kind);
std::string functionCallKind(FunctionCallKind _kind); static std::string functionCallKind(FunctionCallKind _kind);
std::string literalTokenKind(Token::Value _token); static std::string literalTokenKind(Token::Value _token);
std::string type(Expression const& _expression); static std::string type(Expression const& _expression);
std::string type(VariableDeclaration const& _varDecl); static std::string type(VariableDeclaration const& _varDecl);
static int nodeId(ASTNode const& _node) static int nodeId(ASTNode const& _node)
{ {
return _node.id(); return _node.id();
@ -151,8 +151,8 @@ private:
} }
return tmp; return tmp;
} }
Json::Value typePointerToJson(TypePointer _tp); static Json::Value typePointerToJson(TypePointer _tp);
Json::Value typePointerToJson(std::shared_ptr<std::vector<TypePointer>> _tps); static Json::Value typePointerToJson(std::shared_ptr<std::vector<TypePointer>> _tps);
void appendExpressionAttributes( void appendExpressionAttributes(
std::vector<std::pair<std::string, Json::Value>> &_attributes, std::vector<std::pair<std::string, Json::Value>> &_attributes,
ExpressionAnnotation const& _annotation ExpressionAnnotation const& _annotation

4
libsolidity/codegen/ContractCompiler.h
View File

@ -96,8 +96,8 @@ private:
virtual bool visit(IfStatement const& _ifStatement) override; virtual bool visit(IfStatement const& _ifStatement) override;
virtual bool visit(WhileStatement const& _whileStatement) override; virtual bool visit(WhileStatement const& _whileStatement) override;
virtual bool visit(ForStatement const& _forStatement) override; virtual bool visit(ForStatement const& _forStatement) override;
virtual bool visit(Continue const& _continue) override; virtual bool visit(Continue const& _continueStatement) override;
virtual bool visit(Break const& _break) override; virtual bool visit(Break const& _breakStatement) override;
virtual bool visit(Return const& _return) override; virtual bool visit(Return const& _return) override;
virtual bool visit(Throw const& _throw) override; virtual bool visit(Throw const& _throw) override;
virtual bool visit(VariableDeclarationStatement const& _variableDeclarationStatement) override; virtual bool visit(VariableDeclarationStatement const& _variableDeclarationStatement) override;

2
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -1819,7 +1819,7 @@ void ExpressionCompiler::setLValueToStorageItem(Expression const& _expression)
setLValue<StorageItem>(_expression, *_expression.annotation().type); setLValue<StorageItem>(_expression, *_expression.annotation().type);
} }
bool ExpressionCompiler::cleanupNeededForOp(Type::Category _type, Token::Value _op) const bool ExpressionCompiler::cleanupNeededForOp(Type::Category _type, Token::Value _op)
{ {
if (Token::isCompareOp(_op) || Token::isShiftOp(_op)) if (Token::isCompareOp(_op) || Token::isShiftOp(_op))
return true; return true;

2
libsolidity/codegen/ExpressionCompiler.h
View File

@ -119,7 +119,7 @@ private:
/// @returns true if the operator applied to the given type requires a cleanup prior to the /// @returns true if the operator applied to the given type requires a cleanup prior to the
/// operation. /// operation.
bool cleanupNeededForOp(Type::Category _type, Token::Value _op) const; static bool cleanupNeededForOp(Type::Category _type, Token::Value _op);
/// @returns the CompilerUtils object containing the current context. /// @returns the CompilerUtils object containing the current context.
CompilerUtils utils(); CompilerUtils utils();

2
libsolidity/formal/SMTLib2Interface.h
View File

@ -41,7 +41,7 @@ namespace smt
class SMTLib2Interface: public SolverInterface, public boost::noncopyable class SMTLib2Interface: public SolverInterface, public boost::noncopyable
{ {
public: public:
SMTLib2Interface(ReadCallback::Callback const& _queryCallback); explicit SMTLib2Interface(ReadCallback::Callback const& _queryCallback);
void reset() override; void reset() override;

2
libsolidity/interface/ErrorReporter.h
View File

@ -86,7 +86,7 @@ public:
void fatalTypeError(SourceLocation const& _location, std::string const& _description); void fatalTypeError(SourceLocation const& _location, std::string const& _description);
void docstringParsingError(std::string const& _location); void docstringParsingError(std::string const& _description);
ErrorList const& errors() const; ErrorList const& errors() const;

2
test/ExecutionFramework.h
View File

@ -262,7 +262,7 @@ protected:
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0); void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0);
void sendEther(Address const& _to, u256 const& _value); void sendEther(Address const& _to, u256 const& _value);
size_t currentTimestamp(); size_t currentTimestamp();
size_t blockTimestamp(u256 number); size_t blockTimestamp(u256 _number);
/// @returns the (potentially newly created) _ith address. /// @returns the (potentially newly created) _ith address.
Address account(size_t _i); Address account(size_t _i);

6
test/RPCSession.h
View File

@ -40,7 +40,7 @@
class IPCSocket : public boost::noncopyable class IPCSocket : public boost::noncopyable
{ {
public: public:
IPCSocket(std::string const& _path); explicit IPCSocket(std::string const& _path);
std::string sendRequest(std::string const& _req); std::string sendRequest(std::string const& _req);
~IPCSocket() { CloseHandle(m_socket); } ~IPCSocket() { CloseHandle(m_socket); }
@ -55,7 +55,7 @@ private:
class IPCSocket: public boost::noncopyable class IPCSocket: public boost::noncopyable
{ {
public: public:
IPCSocket(std::string const& _path); explicit IPCSocket(std::string const& _path);
std::string sendRequest(std::string const& _req); std::string sendRequest(std::string const& _req);
~IPCSocket() { close(m_socket); } ~IPCSocket() { close(m_socket); }
@ -107,7 +107,7 @@ public:
Json::Value eth_getBlockByNumber(std::string const& _blockNumber, bool _fullObjects); Json::Value eth_getBlockByNumber(std::string const& _blockNumber, bool _fullObjects);
std::string eth_call(TransactionData const& _td, std::string const& _blockNumber); std::string eth_call(TransactionData const& _td, std::string const& _blockNumber);
TransactionReceipt eth_getTransactionReceipt(std::string const& _transactionHash); TransactionReceipt eth_getTransactionReceipt(std::string const& _transactionHash);
std::string eth_sendTransaction(TransactionData const& _transactionData); std::string eth_sendTransaction(TransactionData const& _td);
std::string eth_sendTransaction(std::string const& _transaction); std::string eth_sendTransaction(std::string const& _transaction);
std::string eth_getBalance(std::string const& _address, std::string const& _blockNumber); std::string eth_getBalance(std::string const& _address, std::string const& _blockNumber);
std::string eth_getStorageRoot(std::string const& _address, std::string const& _blockNumber); std::string eth_getStorageRoot(std::string const& _address, std::string const& _blockNumber);

0
test/libdevcore/MiniMoustache.cpp → test/libdevcore/Whiskers.cpp
View File

4
test/libsolidity/AnalysisFramework.h
View File

@ -59,8 +59,8 @@ protected:
void printErrors(); void printErrors();
ContractDefinition const* retrieveContractByName(SourceUnit const& _source, std::string const& _name); static ContractDefinition const* retrieveContractByName(SourceUnit const& _source, std::string const& _name);
FunctionTypePointer retrieveFunctionBySignature( static FunctionTypePointer retrieveFunctionBySignature(
ContractDefinition const& _contract, ContractDefinition const& _contract,
std::string const& _signature std::string const& _signature
); );