Merge pull request #6891

sipa · sipa · commit 8daffe227bc6 · 2015-10-28T02:34:09.000+01:00
ad5aae1 constify missing catch cases (Philip Kaufmann)
diff --git 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
@@ -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
@@ -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
@@ -104,7 +104,7 @@ class CDBIterator
         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 @@ class CDBIterator
             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;

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static bool AppInitRPC(int argc, char* argv[])`
`94`	`94`	`// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)`
`95`	`95`	`try {`
`96`	`96`	`SelectBaseParams(ChainNameFromCommandLine());`
`97`		`- } catch(std::exception &e) {`
	`97`	`+ } catch (const std::exception& e) {`
`98`	`98`	`fprintf(stderr, "Error: %s\n", e.what());`
`99`	`99`	`return false;`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static bool AppInitRawTx(int argc, char* argv[])`
`37`	`37`	`// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)`
`38`	`38`	`try {`
`39`	`39`	`SelectParams(ChainNameFromCommandLine());`
`40`		`- } catch(std::exception &e) {`
	`40`	`+ } catch (const std::exception& e) {`
`41`	`41`	`fprintf(stderr, "Error: %s\n", e.what());`
`42`	`42`	`return false;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ bool AppInit(int argc, char* argv[])`
`109`	`109`	`// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)`
`110`	`110`	`try {`
`111`	`111`	`SelectParams(ChainNameFromCommandLine());`
`112`		`- } catch(std::exception &e) {`
	`112`	`+ } catch (const std::exception& e) {`
`113`	`113`	`fprintf(stderr, "Error: %s\n", e.what());`
`114`	`114`	`return false;`
`115`	`115`	`}`