init: minor parameter interaction updates #5272

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:init changing 1 files +20 −15

Diapolo commented at 2:17 PM on November 13, 2014: none
- use func instead of hard-coded function name for logging
- update -discover help message to reflect newly added parameter interaction
- use DEFAULT_LISTEN in a parameter interaction check instead a hard coded value

init: minor parameter interaction updates

- use __func__ instead of hard-coded function name for logging
- update -discover help message to reflect newly added parameter
  interaction
- use DEFAULT_LISTEN in a parameter interaction check instead a hard coded
  value

13f903187c

sipa commented at 2:46 PM on November 17, 2014: member

utACK

in src/init.cpp:None in 13f903187c

 253 | @@ -254,7 +254,7 @@ std::string HelpMessage(HelpMessageMode mode)
 254 |      strUsage += "  -bantime=<n>           " + strprintf(_("Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), 86400) + "\n";
 255 |      strUsage += "  -bind=<addr>           " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n";
 256 |      strUsage += "  -connect=<ip>          " + _("Connect only to the specified node(s)") + "\n";
 257 | -    strUsage += "  -discover              " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n";
 258 | +    strUsage += "  -discover              " + _("Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)") + "\n";

Diapolo commented at 3:14 PM on November 21, 2014:

@laanwj Sorry, I included it (translation string change) here.

Diapolo commented at 8:27 AM on November 26, 2014: none

Seems like uncontroversial pulls take some time again ;)?
laanwj commented at 12:44 PM on November 26, 2014: member

Uncontroversial but also low-priority and changes a translation message. Going to merge this after 0.10 split-off.
Diapolo commented at 12:55 PM on December 26, 2014: none

@laanwj Ping, the 0.10 split-off happened :).
laanwj merged this on Dec 27, 2014
laanwj closed this on Dec 27, 2014
laanwj referenced this in commit 0f2308cf7c on Dec 27, 2014
Diapolo deleted the branch on Dec 27, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Diapolo

sipa

laanwj