Merge pull request #2412
81fb2f53
Silence more stupid gcc warnings (Howard Chu)
This commit is contained in:
commit
8f1f43163a
|
@ -111,13 +111,13 @@ namespace tools
|
|||
uint64_t res = 0;
|
||||
switch (9 - size)
|
||||
{
|
||||
case 1: res |= *data++;
|
||||
case 2: res <<= 8; res |= *data++;
|
||||
case 3: res <<= 8; res |= *data++;
|
||||
case 4: res <<= 8; res |= *data++;
|
||||
case 5: res <<= 8; res |= *data++;
|
||||
case 6: res <<= 8; res |= *data++;
|
||||
case 7: res <<= 8; res |= *data++;
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
size_t ring_size;
|
||||
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_;
|
||||
|
||||
size_t fake_outs_count;
|
||||
size_t fake_outs_count = 0;
|
||||
if(local_args.size() > 0) {
|
||||
size_t ring_size;
|
||||
if(!epee::string_tools::get_xtype_from_string(ring_size, local_args[0]))
|
||||
|
|
Loading…
Reference in New Issue