Merge pull request #4844

d01bdaca common: fix base58 gcc -Werror=implicit-fallthrough (xiphon)
This commit is contained in:
Riccardo Spagni 2018-11-14 21:29:58 +02:00
commit 9f4ae98d29
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -109,20 +109,8 @@ namespace tools
assert(1 <= size && size <= sizeof(uint64_t)); assert(1 <= size && size <= sizeof(uint64_t));
uint64_t res = 0; uint64_t res = 0;
switch (9 - size) memcpy(reinterpret_cast<uint8_t*>(&res) + sizeof(uint64_t) - size, data, size);
{ return SWAP64BE(res);
case 1: res |= *data++; /* FALLTHRU */
case 2: res <<= 8; res |= *data++; /* FALLTHRU */
case 3: res <<= 8; res |= *data++; /* FALLTHRU */
case 4: res <<= 8; res |= *data++; /* FALLTHRU */
case 5: res <<= 8; res |= *data++; /* FALLTHRU */
case 6: res <<= 8; res |= *data++; /* FALLTHRU */
case 7: res <<= 8; res |= *data++; /* FALLTHRU */
case 8: res <<= 8; res |= *data; break;
default: assert(false);
}
return res;
} }
void uint_64_to_8be(uint64_t num, size_t size, uint8_t* data) void uint_64_to_8be(uint64_t num, size_t size, uint8_t* data)