small changes in init, main, checkpoints.h and bitcoin-qt.pro #2186

Diapolo commented at 2:10 PM on January 18, 2013: none

remove an unneeded MODAL flag, as MSG_ERROR sets MODAL
re-order an if-clause in main to have bool checks before a function call
fix some log messages that used wrong function names
make a log message use a correct ellipsis
remove some unneded spaces, brackets and line-breaks
fix style for adding files in the Qt project

Diapolo commented at 8:05 PM on January 23, 2013: none

I know that some core devs hate these pulls, but it contains only non-controversial changes and I see no reason to not pull it, as it cleans up some small (but real) glitches.

BitcoinPullTester commented at 2:44 AM on January 24, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/0df693f626639a48dc176dcd379efabf0124e9af for binaries and test log.

BitcoinPullTester commented at 12:48 AM on January 26, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/b2c08c3cb1caf43c24ca8fab1b4de44b58485375 for binaries and test log.

BitcoinPullTester commented at 1:31 AM on January 26, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/314c417b518ec66440faf4654085f5e5f4eea08d for binaries and test log.

in src/init.cpp:None in 314c417b51 outdated

 952 | @@ -953,11 +953,9 @@ bool AppInit2()
 953 |  
 954 |      nStart = GetTimeMillis();
 955 |  
 956 | -    {
 957 | -        CAddrDB adb;
 958 | -        if (!adb.Read(addrman))
 959 | -            printf("Invalid or missing peers.dat; recreating\n");
 960 | -    }
 961 | +    CAddrDB adb;

sipa commented at 1:18 PM on January 26, 2013:

This is not a no-op. We want adb to go out of scope as soon as the address database is loaded (since CAddrDB is a very lightweight object now, that doesn't matter much, but in general such seemingly-unnecessary braces can be meaningful for RAII-style stuff).

Diapolo commented at 1:19 PM on January 26, 2013:

@sipa Wow thanks for mentioning it, thought it was a left-over because of diff-style/layout. Edit: Reverted!

in src/main.h:None in 314c417b51 outdated

1562 | @@ -1563,7 +1563,7 @@ class CBlockFileInfo
1563 |       }
1564 |  
1565 |       std::string ToString() const {
1566 | -         return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u..%u, time=%s..%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());
1567 | +         return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());

sipa commented at 1:19 PM on January 26, 2013:

What does this add?

Diapolo commented at 1:22 PM on January 26, 2013:

A correct ellipsis :),

sipa commented at 1:27 PM on January 26, 2013: member

ACK

BitcoinPullTester commented at 1:50 PM on January 26, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/e753544066e149e95df9d691e7ef3e2e79054dfb for binaries and test log.

Diapolo commented at 10:30 AM on January 27, 2013: none

Let's not discuss further, sipa ACKed, so just merge this, as there are 0 code-changes now :).

Diapolo commented at 12:56 PM on January 30, 2013: none

Last rebase adds:

remove an unneeded MODAL flag, as MSG_ERROR sets MODAL
re-order an if-clause in main to have bool checks before a function call

BitcoinPullTester commented at 1:08 PM on January 30, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/8d98fe9b16279805a3296e6265af261dcaa24428 for binaries and test log.

BitcoinPullTester commented at 1:37 PM on January 30, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/8c22df667ef4e611efc69f3721ac7b8b461f6b0c for binaries and test log.

BitcoinPullTester commented at 10:44 PM on February 6, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/cb4bc816a2a1244812c2e3e1022e9fce6b90ed1b for binaries and test log.

small changes in init, main, checkpoints.h and bitcoin-qt.pro

- remove an unneeded MODAL flag, as MSG_ERROR sets MODAL
- re-order an if-clause in main to have bool checks before a function call
- fix some log messages that used wrong function names
- make a log message use a correct ellipsis
- remove some unneded spaces, brackets and line-breaks
- fix style for adding files in the Qt project

69e0774714

Diapolo commented at 10:43 PM on February 23, 2013: none

/merge me?

laanwj referenced this in commit 0bd573d666 on Feb 24, 2013

laanwj merged this on Feb 24, 2013

laanwj closed this on Feb 24, 2013

laudney referenced this in commit 3fe8b55521 on Mar 19, 2014

DrahtBot locked this on Sep 8, 2021