Correct indentation #4202

pull rebroad wants to merge 1 commits into bitcoin:master from rebroad:CorrectIndentation changing 1 files +22 −23

rebroad commented at 4:56 AM on May 20, 2014: contributor

Correct indentation.
Correct indentation 0a263e47d1
BitcoinPullTester commented at 6:34 AM on May 20, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/0a263e47d1b987ab6ca7beda28634a2943b97465 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
luke-jr commented at 6:36 AM on May 20, 2014: member

The indentation was more "correct" before this.

in src/main.cpp:None in 0a263e47d1

3420 | -                    map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
3421 | -                    if (mi != mapRelay.end()) {
3422 | -                        pfrom->PushMessage(inv.GetCommand(), (*mi).second);
3423 | -                        pushed = true;
3424 | +            } else {
3425 | +                if (inv.IsKnownType()) {

unknown commented at 7:33 AM on May 20, 2014:

This changes the logic and your commit says it's just 'indentation' but you have changed the logic without explanation. It should be else if imo

in src/main.cpp:None in 0a263e47d1

3440 | -                        CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
3441 | -                        ss.reserve(1000);
3442 | -                        ss << tx;
3443 | -                        pfrom->PushMessage("tx", ss);
3444 | -                        pushed = true;
3445 | +                    if (!pushed && inv.type == MSG_TX) {

unknown commented at 7:34 AM on May 20, 2014:

This is now outside what was the elseif block and executed anyway if previous if's dont match.

in src/main.cpp:None in 0a263e47d1

3453 | +                        }
3454 |                      }
3455 | -                }
3456 | -                if (!pushed) {
3457 | -                    vNotFound.push_back(inv);
3458 | +                    if (!pushed)

unknown commented at 7:34 AM on May 20, 2014:

Same here, this is now outside of the previous block.

Is this intended?

laanwj commented at 8:02 AM on May 20, 2014: member

Closing this, these kinds of pulls are only acceptable if completely non-controversial. Not worth the bikeshedding.
laanwj closed this on May 20, 2014
DrahtBot locked this on Sep 8, 2021

Contributors

Linked (view graph)

#4207 Correct indentation