From ec91092df8f70c4abef6bbb3c4dec6d9511405fe Mon Sep 17 00:00:00 2001 From: ENikS Date: Fri, 5 Sep 2014 11:37:01 -0400 Subject: [PATCH] Fixing compiler warning C4101 Github-Pull: #4856 --- src/core_read.cpp | 2 +- src/db.h | 2 +- src/leveldbwrapper.h | 2 +- src/main.cpp | 2 +- src/net.cpp | 2 +- src/rpcmining.cpp | 2 +- src/rpcrawtransaction.cpp | 2 +- src/rpcserver.cpp | 2 +- src/txmempool.cpp | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core_read.cpp b/src/core_read.cpp index efcecb106f..179d3514a4 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -97,7 +97,7 @@ bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx) try { ssData >> tx; } - catch (std::exception &e) { + catch (const std::exception &) { return false; } diff --git a/src/db.h b/src/db.h index bba267b84f..0a8c8537e8 100644 --- a/src/db.h +++ b/src/db.h @@ -129,7 +129,7 @@ protected: CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION); ssValue >> value; } - catch (std::exception &e) { + catch (const std::exception &) { return false; } diff --git a/src/leveldbwrapper.h b/src/leveldbwrapper.h index 452df92839..95a22219db 100644 --- a/src/leveldbwrapper.h +++ b/src/leveldbwrapper.h @@ -99,7 +99,7 @@ public: try { CDataStream ssValue(strValue.data(), strValue.data() + strValue.size(), SER_DISK, CLIENT_VERSION); ssValue >> value; - } catch(std::exception &e) { + } catch(const std::exception &) { return false; } return true; diff --git a/src/main.cpp b/src/main.cpp index 02d4bfa8a0..1b746a0b08 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3163,7 +3163,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) blkdat >> nSize; if (nSize < 80 || nSize > MAX_BLOCK_SIZE) continue; - } catch (std::exception &e) { + } catch (const std::exception &) { // no valid block header found; don't complain break; } diff --git a/src/net.cpp b/src/net.cpp index b18944a264..a4bafe5914 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -689,7 +689,7 @@ int CNetMessage::readHeader(const char *pch, unsigned int nBytes) try { hdrbuf >> hdr; } - catch (std::exception &e) { + catch (const std::exception &) { return -1; } diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index e4a5bc4162..1613f04708 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -553,7 +553,7 @@ Value submitblock(const Array& params, bool fHelp) try { ssBlock >> pblock; } - catch (std::exception &e) { + catch (const std::exception &) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed"); } diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index c5c99870fc..cf19c277d8 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -543,7 +543,7 @@ Value signrawtransaction(const Array& params, bool fHelp) ssData >> tx; txVariants.push_back(tx); } - catch (std::exception &e) { + catch (const std::exception &) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); } } diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index c9133bd3d2..190de62282 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -628,7 +628,7 @@ void StartRPCThreads() try { vEndpoints.push_back(ParseEndpoint(addr, defaultPort)); } - catch(boost::system::system_error &e) + catch(const boost::system::system_error &) { uiInterface.ThreadSafeMessageBox( strprintf(_("Could not parse -rpcbind value %s as network address"), addr), diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 119509ae3c..e538645e17 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -574,7 +574,7 @@ CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const fileout << CLIENT_VERSION; // version that wrote the file minerPolicyEstimator->Write(fileout); } - catch (std::exception &e) { + catch (const std::exception &) { LogPrintf("CTxMemPool::WriteFeeEstimates() : unable to write policy estimator data (non-fatal)"); return false; } @@ -593,7 +593,7 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein) LOCK(cs); minerPolicyEstimator->Read(filein, minRelayFee); } - catch (std::exception &e) { + catch (const std::exception &) { LogPrintf("CTxMemPool::ReadFeeEstimates() : unable to read policy estimator data (non-fatal)"); return false; }