minor style cleanup after HTTP rest interface merge #5309

pull Diapolo wants to merge 2 commits into bitcoin:master from Diapolo:cleanup changing 3 files +12 −11

Diapolo commented at 9:54 AM on November 19, 2014: none
- no code changes

in src/rpcserver.h:None in 0246fb907a outdated

 218 | @@ -219,10 +219,6 @@ extern json_spirit::Value gettxout(const json_spirit::Array& params, bool fHelp)
 219 |  extern json_spirit::Value verifychain(const json_spirit::Array& params, bool fHelp);
 220 |  extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp);
 221 |  
 222 | -// in rest.cpp
 223 | -extern bool HTTPReq_REST(AcceptedConnection *conn,
 224 | -                  std::string& strURI,
 225 | -                  std::map<std::string, std::string>& mapHeaders,
 226 | -                  bool fRun);
 227 | +extern bool HTTPReq_REST(AcceptedConnection *conn, std::string& strURI, std::map<std::string, std::string>& mapHeaders, bool fRun); // in rest.cpp

laanwj commented at 10:00 AM on November 19, 2014:

Why make this one wide line with the comment after it? That's harder to read IMO. Please at least keep the comment above the function definition.

Diapolo commented at 10:10 AM on November 19, 2014:

Done, sorry...

laanwj commented at 10:14 AM on November 19, 2014: member

~~Please combine this with #5310~~
laanwj commented at 10:15 AM on November 19, 2014: member

oh, never mind, don't do that, this touches different files...
jgarzik commented at 2:28 PM on November 19, 2014: contributor

ACK everything except the rpcserver change.
Diapolo commented at 11:19 AM on November 20, 2014: none

@jgarzik Done :).
minor style cleanup after HTTP rest interface merge
- no code changes
a01fa3035f
[Qt] minor ordering cleanup after new fee selection 4574248f9f
Diapolo commented at 4:18 PM on November 20, 2014: none

@laanwj Should be uncontroversial now?
laanwj merged this on Nov 24, 2014
laanwj closed this on Nov 24, 2014
laanwj referenced this in commit dfc8e1432a on Nov 24, 2014
Diapolo deleted the branch on Nov 26, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Diapolo

laanwj

jgarzik