Merge pull request #5484

7c8e4c5 Make pass-by-ref arguments const. (Daniel Kraft)
This commit is contained in:
Wladimir J. van der Laan 2014-12-17 19:21:20 +01:00
commit 4444b879bc
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 16 additions and 16 deletions

View File

@ -90,8 +90,8 @@ static bool ParseHashStr(const string& strReq, uint256& v)
}
static bool rest_headers(AcceptedConnection* conn,
string& strReq,
map<string, string>& mapHeaders,
const std::string& strReq,
const std::map<std::string, std::string>& mapHeaders,
bool fRun)
{
vector<string> params;
@ -153,8 +153,8 @@ static bool rest_headers(AcceptedConnection* conn,
}
static bool rest_block(AcceptedConnection* conn,
string& strReq,
map<string, string>& mapHeaders,
const std::string& strReq,
const std::map<std::string, std::string>& 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<string, string>& mapHeaders,
const std::string& strReq,
const std::map<std::string, std::string>& mapHeaders,
bool fRun)
{
return rest_block(conn, strReq, mapHeaders, fRun, true);
}
static bool rest_block_notxdetails(AcceptedConnection* conn,
string& strReq,
map<string, string>& mapHeaders,
const std::string& strReq,
const std::map<std::string, std::string>& mapHeaders,
bool fRun)
{
return rest_block(conn, strReq, mapHeaders, fRun, false);
}
static bool rest_tx(AcceptedConnection* conn,
string& strReq,
map<string, string>& mapHeaders,
const std::string& strReq,
const std::map<std::string, std::string>& mapHeaders,
bool fRun)
{
vector<string> params;
@ -280,8 +280,8 @@ static bool rest_tx(AcceptedConnection* conn,
static const struct {
const char* prefix;
bool (*handler)(AcceptedConnection* conn,
string& strURI,
map<string, string>& mapHeaders,
const std::string& strURI,
const std::map<std::string, std::string>& mapHeaders,
bool fRun);
} uri_prefixes[] = {
{"/rest/tx/", rest_tx},
@ -291,8 +291,8 @@ static const struct {
};
bool HTTPReq_REST(AcceptedConnection* conn,
string& strURI,
map<string, string>& mapHeaders,
const std::string& strURI,
const std::map<std::string, std::string>& mapHeaders,
bool fRun)
{
try {

View File

@ -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<std::string, std::string>& mapHeaders,
const std::string& strURI,
const std::map<std::string, std::string>& mapHeaders,
bool fRun);
#endif // BITCOIN_RPCSERVER_H