diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-10-28 02:31:22 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-10-28 02:34:09 +0100 |
commit | 8daffe227bc67706d6640b67776f7711a6a98607 (patch) | |
tree | 8a5df80256d7a19cae49e483d3f087849cdb0e9e | |
parent | 4764f5db9d2c68e517fe2ba1d67dde39987a525c (diff) | |
parent | ad5aae15b40dcbdbfc08221e615f06b030b92334 (diff) |
Merge pull request #6891
ad5aae1 constify missing catch cases (Philip Kaufmann)
-rw-r--r-- | src/bitcoin-cli.cpp | 2 | ||||
-rw-r--r-- | src/bitcoin-tx.cpp | 2 | ||||
-rw-r--r-- | src/bitcoind.cpp | 2 | ||||
-rw-r--r-- | src/dbwrapper.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 6f22c70494..9564573657 100644 --- a/src/bitcoin-cli.cpp +++ b/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) try { SelectBaseParams(ChainNameFromCommandLine()); - } catch(std::exception &e) { + } catch (const std::exception& e) { fprintf(stderr, "Error: %s\n", e.what()); return false; } diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 3330fe5d12..48033cd8ad 100644 --- a/src/bitcoin-tx.cpp +++ b/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) try { SelectParams(ChainNameFromCommandLine()); - } catch(std::exception &e) { + } catch (const std::exception& e) { fprintf(stderr, "Error: %s\n", e.what()); return false; } diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index d2af897242..addf0e6a26 100644 --- a/src/bitcoind.cpp +++ b/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) try { SelectParams(ChainNameFromCommandLine()); - } catch(std::exception &e) { + } catch (const std::exception& e) { fprintf(stderr, "Error: %s\n", e.what()); return false; } diff --git a/src/dbwrapper.h b/src/dbwrapper.h index aa28767508..1d31ab8ae5 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -104,7 +104,7 @@ public: try { CDataStream ssKey(slKey.data(), slKey.data() + slKey.size(), SER_DISK, CLIENT_VERSION); ssKey >> key; - } catch(std::exception &e) { + } catch (const std::exception&) { return false; } return true; @@ -120,7 +120,7 @@ public: CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); ssValue.Xor(*obfuscate_key); ssValue >> value; - } catch(std::exception &e) { + } catch (const std::exception&) { return false; } return true; |