[Trivial] BIP9 parameters on regtest cleanup #8446

pull paveljanik wants to merge 2 commits into bitcoin:master from paveljanik:20160802_shadow_bip9params changing 1 files +5 −5

paveljanik commented at 8:30 AM on August 2, 2016: contributor

Minor cleanup after https://github.com/bitcoin/bitcoin/commit/56c87e92110f05d7452f1e85bf755246ffc77206
Trivial: bip -> BIP in help text and comment 115265bb10
Do not shadow previous local variable 0fc00bea5d

in src/init.cpp:None in 0fc00bea5d

 995 | @@ -996,10 +996,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 996 |                  return InitError(strprintf("Invalid nTimeout (%s)", vDeploymentParams[2]));
 997 |              }
 998 |              bool found = false;
 999 | -            for (int i=0; i<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i)
1000 | +            for (int j=0; j<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j)

btcdrak commented at 9:41 AM on August 2, 2016:

Why?

paveljanik commented at 9:43 AM on August 2, 2016:

@btcdrak: See #8105. There is auto i a few lines above: https://github.com/bitcoin/bitcoin/blob/master/src/init.cpp#L985

The warning issued is:

init.cpp:999:22: warning: declaration shadows a local variable [-Wshadow]
            for (int i=0; i<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++i)
                     ^
init.cpp:985:19: note: previous declaration is here
        for (auto i : deployments) {
                  ^

paveljanik renamed this:
~~BIP9 parameters on regtest cleanup~~
Trivial: BIP9 parameters on regtest cleanup
on Aug 2, 2016
paveljanik renamed this:
~~Trivial: BIP9 parameters on regtest cleanup~~
[Trivial] BIP9 parameters on regtest cleanup
on Aug 2, 2016
NicolasDorier commented at 4:00 PM on August 2, 2016: contributor

utACK 0fc00bea5d24f4a6715f7069adb7b7396c981308
MarcoFalke added the label Docs and Output on Aug 2, 2016
MarcoFalke commented at 4:10 PM on August 2, 2016: member

utACK 0fc00be
sipa commented at 11:05 PM on August 2, 2016: member

utACK 0fc00bea5d24f4a6715f7069adb7b7396c981308
laanwj commented at 9:05 AM on August 3, 2016: member

utACK 0fc00be
laanwj merged this on Aug 3, 2016
laanwj closed this on Aug 3, 2016
laanwj referenced this in commit ced2d5ef7c on Aug 3, 2016
codablock referenced this in commit 026f2e2a8c on Feb 8, 2018
andvgal referenced this in commit 6e81e4f0df on Jan 6, 2019
CryptoCentric referenced this in commit ee29ce5cb0 on Feb 28, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels