Skip to content

Commit ef4fac0

Browse files
author
MarcoFalke
committed
Merge #13775: doc: Remove newlines from error message
620361f Fix accidental use of the addition assignment operator ("+="). Remove newlines from error message. (practicalswift) Pull request description: Fix accidental use of the addition assignment operator (`+=`). _Note to reviewers:_ Perhaps the `\n`:s should be removed too? Tree-SHA512: 4e8c2dfd6025d78ef9d60522297994829dacc447e6b6782e15c0bdd5dd2daa17ca9a8948bfa9a15be57d9286092356381d7e6747980303852d273eb0df0dd76b
2 parents 365384f + 620361f commit ef4fac0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ bool AppInitParameterInteraction()
927927
// also see: InitParameterInteraction()
928928

929929
if (!fs::is_directory(GetBlocksDir(false))) {
930-
return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.\n"), gArgs.GetArg("-blocksdir", "").c_str()));
930+
return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist."), gArgs.GetArg("-blocksdir", "").c_str()));
931931
}
932932

933933
// if using block pruning, then disallow txindex

src/wallet/wallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4109,7 +4109,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
41094109
// Regenerate the keypool if upgraded to HD
41104110
if (hd_upgrade) {
41114111
if (!walletInstance->TopUpKeyPool()) {
4112-
InitError(_("Unable to generate keys") += "\n");
4112+
InitError(_("Unable to generate keys"));
41134113
return nullptr;
41144114
}
41154115
}
@@ -4137,7 +4137,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
41374137

41384138
// Top up the keypool
41394139
if (!walletInstance->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && !walletInstance->TopUpKeyPool()) {
4140-
InitError(_("Unable to generate initial keys") += "\n");
4140+
InitError(_("Unable to generate initial keys"));
41414141
return nullptr;
41424142
}
41434143

0 commit comments

Comments
 (0)