Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2412 

81fb2f53 Silence more stupid gcc warnings (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-09-20 21:37:40 +02:00
parent 8711c355fc 81fb2f5347
commit 8f1f43163a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/base58.cpp
View File

@ -111,13 +111,13 @@ namespace tools
uint64_t res = 0; uint64_t res = 0;
switch (9 - size) switch (9 - size)
{ {
case 1: res |= *data++; case 1: res |= *data++; /* FALLTHRU */
case 2: res <<= 8; res |= *data++; case 2: res <<= 8; res |= *data++; /* FALLTHRU */
case 3: res <<= 8; res |= *data++; case 3: res <<= 8; res |= *data++; /* FALLTHRU */
case 4: res <<= 8; res |= *data++; case 4: res <<= 8; res |= *data++; /* FALLTHRU */
case 5: res <<= 8; res |= *data++; case 5: res <<= 8; res |= *data++; /* FALLTHRU */
case 6: res <<= 8; res |= *data++; case 6: res <<= 8; res |= *data++; /* FALLTHRU */
case 7: res <<= 8; res |= *data++; case 7: res <<= 8; res |= *data++; /* FALLTHRU */
case 8: res <<= 8; res |= *data; break; case 8: res <<= 8; res |= *data; break;
default: assert(false); default: assert(false);
} }

4
src/simplewallet/simplewallet.cpp
View File

@ -2330,7 +2330,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
} }
} }
size_t fake_outs_count; size_t fake_outs_count = 0;
if(local_args.size() > 0) { if(local_args.size() > 0) {
size_t ring_size; size_t ring_size;
if(!epee::string_tools::get_xtype_from_string(ring_size, local_args[0])) if(!epee::string_tools::get_xtype_from_string(ring_size, local_args[0]))
@ -2907,7 +2907,7 @@ bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &a
std::vector<std::string> local_args = args_; std::vector<std::string> local_args = args_;
size_t fake_outs_count; size_t fake_outs_count = 0;
if(local_args.size() > 0) { if(local_args.size() > 0) {
size_t ring_size; size_t ring_size;
if(!epee::string_tools::get_xtype_from_string(ring_size, local_args[0])) if(!epee::string_tools::get_xtype_from_string(ring_size, local_args[0]))