From 7c8e4c5cfb3dd88bbe89cc14b703d7c59bafed6e Mon Sep 17 00:00:00 2001 From: Daniel Kraft Date: Tue, 16 Dec 2014 13:45:27 +0100 Subject: [PATCH] Make pass-by-ref arguments const. Make some of the arguments in rest.cpp, that are passed by reference but never modified, const to emphasise that. --- src/rest.cpp | 30 +++++++++++++++--------------- src/rpcserver.h | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/rest.cpp b/src/rest.cpp index c52dbb3cd..69e6c0888 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -90,8 +90,8 @@ static bool ParseHashStr(const string& strReq, uint256& v) } static bool rest_headers(AcceptedConnection* conn, - string& strReq, - map& mapHeaders, + const std::string& strReq, + const std::map& mapHeaders, bool fRun) { vector params; @@ -153,8 +153,8 @@ static bool rest_headers(AcceptedConnection* conn, } static bool rest_block(AcceptedConnection* conn, - string& strReq, - map& mapHeaders, + const std::string& strReq, + const std::map& mapHeaders, bool fRun, bool showTxDetails) { @@ -211,24 +211,24 @@ static bool rest_block(AcceptedConnection* conn, } static bool rest_block_extended(AcceptedConnection* conn, - string& strReq, - map& mapHeaders, + const std::string& strReq, + const std::map& mapHeaders, bool fRun) { return rest_block(conn, strReq, mapHeaders, fRun, true); } static bool rest_block_notxdetails(AcceptedConnection* conn, - string& strReq, - map& mapHeaders, + const std::string& strReq, + const std::map& mapHeaders, bool fRun) { return rest_block(conn, strReq, mapHeaders, fRun, false); } static bool rest_tx(AcceptedConnection* conn, - string& strReq, - map& mapHeaders, + const std::string& strReq, + const std::map& mapHeaders, bool fRun) { vector params; @@ -280,8 +280,8 @@ static bool rest_tx(AcceptedConnection* conn, static const struct { const char* prefix; bool (*handler)(AcceptedConnection* conn, - string& strURI, - map& mapHeaders, + const std::string& strURI, + const std::map& mapHeaders, bool fRun); } uri_prefixes[] = { {"/rest/tx/", rest_tx}, @@ -291,8 +291,8 @@ static const struct { }; bool HTTPReq_REST(AcceptedConnection* conn, - string& strURI, - map& mapHeaders, + const std::string& strURI, + const std::map& mapHeaders, bool fRun) { try { @@ -307,7 +307,7 @@ bool HTTPReq_REST(AcceptedConnection* conn, return uri_prefixes[i].handler(conn, strReq, mapHeaders, fRun); } } - } catch (RestErr& re) { + } catch (const RestErr& re) { conn->stream() << HTTPReply(re.status, re.message + "\r\n", false, false, "text/plain") << std::flush; return false; } diff --git a/src/rpcserver.h b/src/rpcserver.h index 2b2428445..8fea38126 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -227,8 +227,8 @@ extern json_spirit::Value reconsiderblock(const json_spirit::Array& params, bool // in rest.cpp extern bool HTTPReq_REST(AcceptedConnection *conn, - std::string& strURI, - std::map& mapHeaders, + const std::string& strURI, + const std::map& mapHeaders, bool fRun); #endif // BITCOIN_RPCSERVER_H