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 #5033 from liangdzou/fix_source_format_issue

Browse Source 
fix format issue for source files to enable the format checker in PR #5027
This commit is contained in:
chriseth 2018-09-20 14:32:34 +02:00 committed by GitHub
commit 5a473ab682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdevcore/SHA3.cpp
View File

@ -98,7 +98,8 @@ 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};
for (int i = 0; i < 24; i++) { for (int i = 0; i < 24; i++)
{
uint8_t x, y; uint8_t x, y;
// Theta // Theta
FOR5(x, 1, FOR5(x, 1,
@ -166,7 +167,8 @@ mkapply_sd(setout, dst[i] = src[i]) // setout
static inline int hash(uint8_t* out, size_t outlen, static inline int hash(uint8_t* out, size_t outlen,
const uint8_t* in, size_t inlen, const uint8_t* in, size_t inlen,
size_t rate, uint8_t delim) { size_t rate, uint8_t delim) {
if ((out == NULL) || ((in == NULL) && inlen != 0) || (rate >= Plen)) { if ((out == NULL) || ((in == NULL) && inlen != 0) || (rate >= Plen))
{
return -1; return -1;
} }
uint8_t a[Plen] = {0}; uint8_t a[Plen] = {0};

3
solc/CommandLineInterface.cpp
View File

@ -736,7 +736,8 @@ bool CommandLineInterface::processInput()
if (m_args.count(g_argAllowPaths)) if (m_args.count(g_argAllowPaths))
{ {
vector<string> paths; vector<string> paths;
for (string const& path: boost::split(paths, m_args[g_argAllowPaths].as<string>(), boost::is_any_of(","))) { for (string const& path: boost::split(paths, m_args[g_argAllowPaths].as<string>(), boost::is_any_of(",")))
{
auto filesystem_path = boost::filesystem::path(path); auto filesystem_path = boost::filesystem::path(path);
// If the given path had a trailing slash, the Boost filesystem // If the given path had a trailing slash, the Boost filesystem
// path will have it's last component set to '.'. This breaks // path will have it's last component set to '.'. This breaks