add missing CAutoFile::IsNull() check in main #5437

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

Diapolo commented at 11:58 AM on December 7, 2014: none
- also use func in error messages related to block files
- minor comment changes and remove space after function name in log messages in touched functions
in src/main.cpp:None in dc102dd136 outdated
```
1091 | +                    return error("%s: Deserialize or I/O error - %s", __func__, e.what());
1092 |                  }
1093 |                  hashBlock = header.GetHash();
1094 |                  if (txOut.GetHash() != hash)
1095 | -                    return error("%s : txid mismatch", __func__);
1096 | +                    return error("%s: Txid mismatch", __func__);
```
sipa commented at 12:00 PM on December 7, 2014:

Why?

Diapolo commented at 12:34 PM on December 7, 2014:

Just because the space after function name is not needed, I had a discussion with @laanwj about that. Uppercase just because of consistency... Deserialize is also uppercase.

laanwj commented at 9:13 AM on December 9, 2014:

+1 on keeping txid in lowercase

Diapolo commented at 11:09 AM on December 9, 2014:

I reverted that, no problem :).

add missing CAutoFile::IsNull() check in main

- also use __func__ in error messages related to block files
- minor comment changes and remove space after function name in log
  messages in touched functions

ccd056a30d

Diapolo commented at 7:12 AM on December 12, 2014: none

@sipa Getting an ACK now ;)?
laanwj commented at 9:34 AM on December 16, 2014: member

Good catch.

But you add one missing check and you make changes all over the file. Can you please change this to just make the one change suggested in the pull title?

ACK in that case.
laanwj added the label Improvement on Dec 16, 2014
Diapolo commented at 1:20 PM on December 16, 2014: none

All changes are mentioned in the commit-msg, so you also choose to remove the space after : when logging stuff. This doesn't need a discussion at all if you could just credit what I'm doing and tell me please use 2 commits for example or that you will NACK all minor stuff I try to get in recently ^^.
laanwj commented at 2:21 PM on December 16, 2014: member
1. Isolated commits are good. If you can solve a problem with a one-line change, you're a ninja
2. I'm indeed trying to tone down on the minor stuff. I'm getting a bit overworked, so I'm trying hard to focus on what matters
3. Ancillary changes can unnecessarily break other pulls, there has been a bit of annoyance about that lately
So: please, do only the mentioned fix, and leave the rest of the file as-is.
laanwj referenced this in commit 84857e87e4 on Dec 19, 2014
laanwj commented at 5:48 PM on December 19, 2014: member

Merged via 84857e87e42e412336ea60d0f8544c1679bab827
laanwj closed this on Dec 19, 2014
laanwj referenced this in commit b03632a671 on Dec 19, 2014
Diapolo deleted the branch on Dec 20, 2014
reddink referenced this in commit 8cd1259ce8 on May 27, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels