From c6b07fddcfb664d7d1afbff460a68479fe1238d2 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 9 Oct 2017 10:37:40 +0200 Subject: [PATCH 1/3] Fix a vs. an typo --- src/netbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netbase.cpp b/src/netbase.cpp index 5a560bc95a4..82040605c55 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -291,7 +291,7 @@ struct ProxyCredentials std::string password; }; -/** Convert SOCKS5 reply to a an error message */ +/** Convert SOCKS5 reply to an error message */ std::string Socks5ErrorString(uint8_t err) { switch(err) { From 68feb49105a9a473cf97dc2eb67e9370051d9ca6 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 9 Oct 2017 14:26:53 +0200 Subject: [PATCH 2/3] Use nullptr instead of NULL --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 925b474d73c..872b2d1e0e0 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3870,7 +3870,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) // Top up the keypool if (!walletInstance->TopUpKeyPool()) { InitError(_("Unable to generate initial keys") += "\n"); - return NULL; + return nullptr; } walletInstance->SetBestChain(chainActive.GetLocator()); From 0aacfa43c16af307ad154d9fbc5dade80f6f88d5 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 9 Oct 2017 14:36:01 +0200 Subject: [PATCH 3/3] Remove accidental stray semicolon --- contrib/verify-commits/verify-commits.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 74b7f38375a..7194b040eb6 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -39,7 +39,7 @@ PREV_COMMIT="" while true; do if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then echo "There is a valid path from "$CURRENT_COMMIT" to $VERIFIED_ROOT where all commits are signed!" - exit 0; + exit 0 fi if [ "$CURRENT_COMMIT" = $VERIFIED_SHA512_ROOT ]; then