[trivial] Cleanup init.cpp and rpc message #6664

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-cleanup01 changing 2 files +7 −6

MarcoFalke commented at 11:39 AM on September 12, 2015: member

This PR combines several trivial changes. ~~The commits cover various locations in the source code so it is best to review them one-by-one.~~
[trivial] init cleanup 4c3cab14b7
[trivial] Fix rpc message "help generate" 51ff777357

in src/rpcmining.cpp:None in c3a11db4a8 outdated

 119 | @@ -120,6 +120,7 @@ UniValue generate(const UniValue& params, bool fHelp)
 120 |              "\nMine blocks immediately (before the RPC call returns)\n"
 121 |              "\nNote: this function can only be used on the regtest network\n"
 122 |              "1. numblocks    (numeric, required) How many blocks are generated immediately.\n"
 123 | +            "\nArguments:\n"

dexX7 commented at 3:45 PM on September 12, 2015:

Should be above L122.

MarcoFalke commented at 5:11 PM on September 12, 2015:

Indeed, rebase mistake. Thank you.

MarcoFalke force-pushed on Sep 12, 2015
MarcoFalke force-pushed on Sep 12, 2015
MarcoFalke force-pushed on Sep 12, 2015
jonasschnelli commented at 1:08 PM on September 13, 2015: contributor

Maybe try to distinct between the code and the docs/images changes? Mixed PRs are hard to review and merge.
in contrib/debian/copyright:None in 3bf762116d outdated
```
 100 | +Comment:
 101 |  
 102 | -Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
 103 | -Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 104 | +Files: src/qt/res/icons/bitcoin.*, src/qt/res/src/bitcoin.svg
 105 | +Copyright: Bitboy
```
jonasschnelli commented at 1:10 PM on September 13, 2015:

Maybe add my name here because the svg was not done by Bitboy and contains some shadows, gradients, etc.

MarcoFalke commented at 1:56 PM on September 13, 2015:

Thanks for letting me know. I fixed that and created another PR. There will be more noise but I think it is easier to discuss or merge when the PRs are split.

in src/init.cpp:None in 3bf762116d outdated

1008 | @@ -1009,7 +1009,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
1009 |          if (!warningString.empty())
1010 |              InitWarning(warningString);
1011 |          if (!errorString.empty())
1012 | -            return InitError(warningString);
1013 | +            return InitError(errorString);

jonasschnelli commented at 1:12 PM on September 13, 2015:

Good catch! This should go in definitively. Splitting the PR into chunks that make sense and are independent would be nice.

MarcoFalke commented at 4:03 PM on September 13, 2015:

Splitting the PR into chunks

Done.

MarcoFalke force-pushed on Sep 13, 2015
MarcoFalke renamed this:
~~[cleanup] icons, comments, misc.~~
[trivial] Cleanup init.cpp and rpc message
on Sep 13, 2015
dcousens commented at 2:32 AM on September 14, 2015: contributor

utACK
jgarzik commented at 3:26 AM on September 16, 2015: contributor

ut ACK
paveljanik commented at 7:09 AM on September 16, 2015: contributor

utACK
btcdrak commented at 6:24 PM on September 18, 2015: contributor

utACK
laanwj added the label Docs and Output on Sep 23, 2015
in src/init.cpp:None in 51ff777357
```
 294 | @@ -295,7 +295,7 @@ std::string HelpMessage(HelpMessageMode mode)
 295 |      strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "bitcoin.conf"));
 296 |      if (mode == HMM_BITCOIND)
 297 |      {
 298 | -#if !defined(WIN32)
 299 | +#ifndef WIN32
```
laanwj commented at 5:43 PM on September 23, 2015:

What is the point of this change? #if !defined(XX) and #ifndef XX are equivalent, with the difference that the first can be used as part of expressions, but I don't see a reason to change it around.

MarcoFalke commented at 9:53 AM on September 24, 2015:

The other six usages are #ifndef and it was a different author who chose the #if !defined() twice. But I can remove those if you prefer less diff over consistency.

laanwj commented at 4:19 PM on September 24, 2015:

I just don't see it as very constructive - e.g. a) a lot of pull requests hit this code due to adding/removing arguments, and b) there's an infinite number of commits like this possible, the next person may change them to #if ! again for aesthetic reasons.

But no need to revert it, the other changes in this pull are useful, so I'm just going to merge...
laanwj merged this on Sep 24, 2015
laanwj closed this on Sep 24, 2015
laanwj referenced this in commit 34dc03d8e0 on Sep 24, 2015
MarcoFalke deleted the branch on Sep 24, 2015
MarcoFalke referenced this in commit 7e1f9750b6 on Mar 14, 2016
zkbot referenced this in commit 8713d73daf on Dec 18, 2019
zkbot referenced this in commit 2da77edbfe on Dec 18, 2019
zkbot referenced this in commit 577f7ef72a on Dec 18, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels