small formatting, indentation and comment fixes #4170

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:fix_misc changing 7 files +21 −21

Diapolo commented at 12:58 PM on May 10, 2014: none
- contains zero code changes
brandondahler commented at 4:16 AM on May 30, 2014: contributor

This makes me happy, reviewed--looks good.
Diapolo commented at 8:03 PM on June 4, 2014: none

@brandondahler Seems you are the only one ;).

in src/util.cpp:None in 55f15b8735 outdated

 968 |  
 969 |  boost::filesystem::path GetConfigFile()
 970 |  {
 971 |      boost::filesystem::path pathConfigFile(GetArg("-conf", "bitcoin.conf"));
 972 | -    if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile;
 973 | +    if (!pathConfigFile.is_absolute())

laanwj commented at 4:20 AM on June 5, 2014:

Please revert this change from is_complete to is_absolute, it's no longer in the "small formatting, indentation and comment fixes" category.

Diapolo commented at 5:43 AM on June 5, 2014: none

@laanwj Sorry, my fault... this sneaked in unwanted!
small formatting, indentation and comment fixes
- contains zero code changes
ac14bcc1f1
BitcoinPullTester commented at 4:51 PM on June 10, 2014: none
Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/ac14bcc1f12d2407516bcdfef57b2740df48381b for binaries and test log.

This could happen for one of several reasons:
1. It chanages paths in makefile.linux-mingw or otherwise changes build scripts in a way that made them incompatible with the automated testing scripts (please tweak those patches in qa/pull-tester)
2. It adds/modifies tests which test network rules (thanks for doing that), which conflicts with a patch applied at test time
3. It does not build on either Linux i386 or Win32 (via MinGW cross compile)
4. The test suite fails on either Linux i386 or Win32
5. The block test-cases failed (lookup the first bNN identifier which failed in https://github.com/TheBlueMatt/test-scripts/blob/master/FullBlockTestGenerator.java)
If you believe this to be in error, please ping BlueMatt on freenode or TheBlueMatt here.

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.
Diapolo commented at 8:43 AM on June 11, 2014: none

@laanwj What can I do to get such pulls merged ASAP? They start small but over time as more and more small glitches sneak into master they grow and I'm getting told no one has time to look at them. I really just want to ensure our codebase is cleaned up and as you know I'm fine with creating such pulls. Most devs don't care that much about introducing errors, so they also shouldn't care when I fix them?
laanwj commented at 9:30 AM on June 11, 2014: member

@Diapolo I'm sorry to say, but these kinds of changes always get low priority in reviewing because they don't solve an issue. It's pretty much just your opinion on how the code should be formatted. I (and other devs) have a limited capacity with regard to how much code we can review in a day. That said, ACK.
laanwj merged this on Jun 11, 2014
laanwj closed this on Jun 11, 2014
laanwj referenced this in commit 5905d71fe3 on Jun 11, 2014
Diapolo deleted the branch on Jun 11, 2014
DrahtBot locked this on Sep 8, 2021

Contributors