Fix typos. Use nullptr instead of NULL. #11467

pull practicalswift wants to merge 3 commits into bitcoin:master from practicalswift:cleanups-20171009 changing 3 files +3 −3

practicalswift commented at 1:18 PM on October 9, 2017: contributor
Minor cleanups:
- Typo: Fix a vs. an typo
- Typo: Remove accidental stray semicolon (only remaining instance in repo)
- Correctness/consistency: Use nullptr instead of NULL (only remaining instance in repo)
Fix a vs. an typo c6b07fddcf
Use nullptr instead of NULL 68feb49105
in src/wallet/rpcwallet.cpp:29 in b671cba060 outdated
```
  25 | @@ -26,8 +26,7 @@
  26 |  #include "wallet/feebumper.h"
  27 |  #include "wallet/wallet.h"
  28 |  #include "wallet/walletdb.h"
  29 | -
  30 | -#include <init.h>  // For StartShutdown
  31 | +#include "init.h"  // For StartShutdown
```
paveljanik commented at 2:04 PM on October 9, 2017:

wallet/?

paveljanik commented at 2:15 PM on October 9, 2017:

No, src one, but it includes src/wallet instead.

laanwj commented at 2:20 PM on October 9, 2017:

This change to a relative include is wrong. We want wallet in the include root, not init in wallet/
in src/wallet/feebumper.h:8 in b671cba060 outdated
```
   4 | @@ -5,7 +5,7 @@
   5 |  #ifndef BITCOIN_WALLET_FEEBUMPER_H
   6 |  #define BITCOIN_WALLET_FEEBUMPER_H
   7 |  
   8 | -#include <primitives/transaction.h>
   9 | +#include "primitives/transaction.h"
```
laanwj commented at 2:04 PM on October 9, 2017:

IMO it makes more sense to have this as <> - "" includes first relative to the directory of the file which would try src/wallet/primitives/transaction.h
Remove accidental stray semicolon 0aacfa43c1
in src/qt/rpcconsole.cpp:28 in b671cba060 outdated
```
  24 | @@ -25,7 +25,7 @@
  25 |  
  26 |  #ifdef ENABLE_WALLET
  27 |  #include <db_cxx.h>
  28 | -#include <wallet/wallet.h>
  29 | +#include "wallet/wallet.h"
```
laanwj commented at 2:05 PM on October 9, 2017:

Same comment here. Making this a relative include makes the compiler try src/qt/wallet/wallet.h, which doesn't exist.
practicalswift force-pushed on Oct 9, 2017
practicalswift renamed this:
~~Fix typos. Use nullptr instead of NULL. Use quote form for local includes.~~
Fix typos. Use nullptr instead of NULL.
on Oct 9, 2017
practicalswift commented at 2:25 PM on October 9, 2017: contributor

@laanwj @paveljanik Thanks for the quick feedback. Good points raised - I've now excluded the quoted form includes.
paveljanik commented at 3:03 PM on October 9, 2017: contributor

ACK https://github.com/bitcoin/bitcoin/pull/11467/commits/0aacfa43c16af307ad154d9fbc5dade80f6f88d5
promag commented at 3:59 PM on October 9, 2017: member

ACK 0aacfa4.
laanwj commented at 3:01 PM on October 18, 2017: member

utACK 0aacfa4, these changes are obviously correct.
laanwj merged this on Oct 18, 2017
laanwj closed this on Oct 18, 2017
laanwj referenced this in commit 937613d215 on Oct 18, 2017
PastaPastaPasta referenced this in commit 6fbb55aa0b on Dec 22, 2019
PastaPastaPasta referenced this in commit 7d3dee9f1a on Jan 2, 2020
PastaPastaPasta referenced this in commit c5f9e1ca74 on Jan 4, 2020
PastaPastaPasta referenced this in commit c8a15cab98 on Jan 12, 2020
PastaPastaPasta referenced this in commit b910d90d87 on Jan 12, 2020
PastaPastaPasta referenced this in commit d4cd3a610f on Jan 12, 2020
PastaPastaPasta referenced this in commit 03153b31c9 on Jan 12, 2020
PastaPastaPasta referenced this in commit 5652ed6341 on Jan 12, 2020
PastaPastaPasta referenced this in commit 0cdf93b38b on Jan 12, 2020
PastaPastaPasta referenced this in commit e357bda75b on Jan 16, 2020
ckti referenced this in commit 487158dce1 on Mar 28, 2021
practicalswift deleted the branch on Apr 10, 2021
gades referenced this in commit 2d563a18bc on Mar 17, 2022
DrahtBot locked this on Aug 16, 2022

Contributors