Browse Source

Merge pull request #6891

ad5aae1 constify missing catch cases (Philip Kaufmann)
0.13
Pieter Wuille 9 years ago
parent
commit
8daffe227b
No known key found for this signature in database
GPG Key ID: DBA1A67379A1A931
  1. 2
      src/bitcoin-cli.cpp
  2. 2
      src/bitcoin-tx.cpp
  3. 2
      src/bitcoind.cpp
  4. 4
      src/dbwrapper.h

2
src/bitcoin-cli.cpp

@ -94,7 +94,7 @@ static bool AppInitRPC(int argc, char* argv[])
// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause) // Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
try { try {
SelectBaseParams(ChainNameFromCommandLine()); SelectBaseParams(ChainNameFromCommandLine());
} catch(std::exception &e) { } catch (const std::exception& e) {
fprintf(stderr, "Error: %s\n", e.what()); fprintf(stderr, "Error: %s\n", e.what());
return false; return false;
} }

2
src/bitcoin-tx.cpp

@ -37,7 +37,7 @@ static bool AppInitRawTx(int argc, char* argv[])
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
try { try {
SelectParams(ChainNameFromCommandLine()); SelectParams(ChainNameFromCommandLine());
} catch(std::exception &e) { } catch (const std::exception& e) {
fprintf(stderr, "Error: %s\n", e.what()); fprintf(stderr, "Error: %s\n", e.what());
return false; return false;
} }

2
src/bitcoind.cpp

@ -109,7 +109,7 @@ bool AppInit(int argc, char* argv[])
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
try { try {
SelectParams(ChainNameFromCommandLine()); SelectParams(ChainNameFromCommandLine());
} catch(std::exception &e) { } catch (const std::exception& e) {
fprintf(stderr, "Error: %s\n", e.what()); fprintf(stderr, "Error: %s\n", e.what());
return false; return false;
} }

4
src/dbwrapper.h

@ -104,7 +104,7 @@ public:
try { try {
CDataStream ssKey(slKey.data(), slKey.data() + slKey.size(), SER_DISK, CLIENT_VERSION); CDataStream ssKey(slKey.data(), slKey.data() + slKey.size(), SER_DISK, CLIENT_VERSION);
ssKey >> key; ssKey >> key;
} catch(std::exception &e) { } catch (const std::exception&) {
return false; return false;
} }
return true; return true;
@ -120,7 +120,7 @@ public:
CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION);
ssValue.Xor(*obfuscate_key); ssValue.Xor(*obfuscate_key);
ssValue >> value; ssValue >> value;
} catch(std::exception &e) { } catch (const std::exception&) {
return false; return false;
} }
return true; return true;

Loading…
Cancel
Save