Skip to content

Commit 0a1029a

Browse files
committed
lint: remove /* Continued */ markers from codebase
1 parent 9100079 commit 0a1029a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

src/dbwrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CBitcoinLevelDBLogger : public leveldb::Logger {
7676

7777
assert(p <= limit);
7878
base[std::min(bufsize - 1, (int)(p - base))] = '\0';
79-
LogPrintLevel(BCLog::LEVELDB, BCLog::Level::Debug, "%s", base); /* Continued */
79+
LogPrintLevel(BCLog::LEVELDB, BCLog::Level::Debug, "%s", base);
8080
if (base != buffer) {
8181
delete[] base;
8282
}

src/index/base.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ void BaseIndex::BlockConnected(const std::shared_ptr<const CBlock>& block, const
270270
// in the ValidationInterface queue backlog even after the sync thread has caught up to the
271271
// new chain tip. In this unlikely event, log a warning and let the queue clear.
272272
if (best_block_index->GetAncestor(pindex->nHeight - 1) != pindex->pprev) {
273-
LogPrintf("%s: WARNING: Block %s does not connect to an ancestor of " /* Continued */
273+
LogPrintf("%s: WARNING: Block %s does not connect to an ancestor of "
274274
"known best chain (tip=%s); not updating index\n",
275275
__func__, pindex->GetBlockHash().ToString(),
276276
best_block_index->GetBlockHash().ToString());
@@ -322,7 +322,7 @@ void BaseIndex::ChainStateFlushed(const CBlockLocator& locator)
322322
// event, log a warning and let the queue clear.
323323
const CBlockIndex* best_block_index = m_best_block_index.load();
324324
if (best_block_index->GetAncestor(locator_tip_index->nHeight) != locator_tip_index) {
325-
LogPrintf("%s: WARNING: Locator contains block (hash=%s) not on known best " /* Continued */
325+
LogPrintf("%s: WARNING: Locator contains block (hash=%s) not on known best "
326326
"chain (tip=%s); not writing index locator\n",
327327
__func__, locator_tip_hash.ToString(),
328328
best_block_index->GetBlockHash().ToString());

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
10821082

10831083
// Warn about relative -datadir path.
10841084
if (args.IsArgSet("-datadir") && !args.GetPathArg("-datadir").is_absolute()) {
1085-
LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the " /* Continued */
1085+
LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the "
10861086
"current working directory '%s'. This is fragile, because if bitcoin is started in the future "
10871087
"from a different location, it will be unable to locate the current data files. There could "
10881088
"also be data loss if bitcoin is started while in a temporary directory.\n",

src/net_processing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3048,7 +3048,7 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,
30483048

30493049
uint32_t stop_height = stop_index->nHeight;
30503050
if (start_height > stop_height) {
3051-
LogPrint(BCLog::NET, "peer %d sent invalid getcfilters/getcfheaders with " /* Continued */
3051+
LogPrint(BCLog::NET, "peer %d sent invalid getcfilters/getcfheaders with "
30523052
"start height %d and stop height %d\n",
30533053
node.GetId(), start_height, stop_height);
30543054
node.fDisconnect = true;

src/node/utxo_snapshot.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ bool WriteSnapshotBaseBlockhash(Chainstate& snapshot_chainstate)
4949
std::optional<uint256> ReadSnapshotBaseBlockhash(fs::path chaindir)
5050
{
5151
if (!fs::exists(chaindir)) {
52-
LogPrintf("[snapshot] cannot read base blockhash: no chainstate dir " /* Continued */
52+
LogPrintf("[snapshot] cannot read base blockhash: no chainstate dir "
5353
"exists at path %s\n", fs::PathToString(chaindir));
5454
return std::nullopt;
5555
}
5656
const fs::path read_from = chaindir / node::SNAPSHOT_BLOCKHASH_FILENAME;
5757
const std::string read_from_str = fs::PathToString(read_from);
5858

5959
if (!fs::exists(read_from)) {
60-
LogPrintf("[snapshot] snapshot chainstate dir is malformed! no base blockhash file " /* Continued */
60+
LogPrintf("[snapshot] snapshot chainstate dir is malformed! no base blockhash file "
6161
"exists at path %s. Try deleting %s and calling loadtxoutset again?\n",
6262
fs::PathToString(chaindir), read_from_str);
6363
return std::nullopt;

src/validation.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3102,7 +3102,7 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
31023102
// Belt-and-suspenders check that we aren't attempting to advance the background
31033103
// chainstate past the snapshot base block.
31043104
if (WITH_LOCK(::cs_main, return m_disabled)) {
3105-
LogPrintf("m_disabled is set - this chainstate should not be in operation. " /* Continued */
3105+
LogPrintf("m_disabled is set - this chainstate should not be in operation. "
31063106
"Please report this as a bug. %s\n", PACKAGE_BUGREPORT);
31073107
return false;
31083108
}
@@ -5226,7 +5226,7 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
52265226
auto maybe_au_data = ExpectedAssumeutxo(base_height, GetParams());
52275227

52285228
if (!maybe_au_data) {
5229-
LogPrintf("[snapshot] assumeutxo height in snapshot metadata not recognized " /* Continued */
5229+
LogPrintf("[snapshot] assumeutxo height in snapshot metadata not recognized "
52305230
"(%d) - refusing to load snapshot\n", base_height);
52315231
return false;
52325232
}
@@ -5473,7 +5473,7 @@ SnapshotCompletionResult ChainstateManager::MaybeCompleteSnapshotValidation()
54735473
};
54745474

54755475
if (index_new.GetBlockHash() != snapshot_blockhash) {
5476-
LogPrintf("[snapshot] supposed base block %s does not match the " /* Continued */
5476+
LogPrintf("[snapshot] supposed base block %s does not match the "
54775477
"snapshot base block %s (height %d). Snapshot is not valid.",
54785478
index_new.ToString(), snapshot_blockhash.ToString(), snapshot_base_height);
54795479
handle_invalid_snapshot();
@@ -5494,15 +5494,15 @@ SnapshotCompletionResult ChainstateManager::MaybeCompleteSnapshotValidation()
54945494

54955495
auto maybe_au_data = ExpectedAssumeutxo(curr_height, m_options.chainparams);
54965496
if (!maybe_au_data) {
5497-
LogPrintf("[snapshot] assumeutxo data not found for height " /* Continued */
5497+
LogPrintf("[snapshot] assumeutxo data not found for height "
54985498
"(%d) - refusing to validate snapshot\n", curr_height);
54995499
handle_invalid_snapshot();
55005500
return SnapshotCompletionResult::MISSING_CHAINPARAMS;
55015501
}
55025502

55035503
const AssumeutxoData& au_data = *maybe_au_data;
55045504
std::optional<CCoinsStats> maybe_ibd_stats;
5505-
LogPrintf("[snapshot] computing UTXO stats for background chainstate to validate " /* Continued */
5505+
LogPrintf("[snapshot] computing UTXO stats for background chainstate to validate "
55065506
"snapshot - this could take a few minutes\n");
55075507
try {
55085508
maybe_ibd_stats = ComputeUTXOStats(
@@ -5740,7 +5740,7 @@ bool ChainstateManager::ValidatedSnapshotCleanup()
57405740
// is in-memory, in which case we can't do on-disk cleanup. You'd better be
57415741
// in a unittest!
57425742
if (!ibd_chainstate_path_maybe || !snapshot_chainstate_path_maybe) {
5743-
LogPrintf("[snapshot] snapshot chainstate cleanup cannot happen with " /* Continued */
5743+
LogPrintf("[snapshot] snapshot chainstate cleanup cannot happen with "
57445744
"in-memory chainstates. You are testing, right?\n");
57455745
return false;
57465746
}
@@ -5783,7 +5783,7 @@ bool ChainstateManager::ValidatedSnapshotCleanup()
57835783
throw;
57845784
}
57855785

5786-
LogPrintf("[snapshot] moving snapshot chainstate (%s) to " /* Continued */
5786+
LogPrintf("[snapshot] moving snapshot chainstate (%s) to "
57875787
"default chainstate directory (%s)\n",
57885788
fs::PathToString(snapshot_chainstate_path), fs::PathToString(ibd_chainstate_path));
57895789

@@ -5797,7 +5797,7 @@ bool ChainstateManager::ValidatedSnapshotCleanup()
57975797
if (!DeleteCoinsDBFromDisk(tmp_old, /*is_snapshot=*/false)) {
57985798
// No need to FatalError because once the unneeded bg chainstate data is
57995799
// moved, it will not interfere with subsequent initialization.
5800-
LogPrintf("Deletion of %s failed. Please remove it manually, as the " /* Continued */
5800+
LogPrintf("Deletion of %s failed. Please remove it manually, as the "
58015801
"directory is now unnecessary.\n",
58025802
fs::PathToString(tmp_old));
58035803
} else {

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,7 @@ OutputType CWallet::TransactionChangeType(const std::optional<OutputType>& chang
23192319
void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
23202320
{
23212321
LOCK(cs_wallet);
2322-
WalletLogPrintf("CommitTransaction:\n%s", tx->ToString()); /* Continued */
2322+
WalletLogPrintf("CommitTransaction:\n%s", tx->ToString());
23232323

23242324
// Add tx to wallet, because if it has change it's also ours,
23252325
// otherwise just for transaction history.

0 commit comments

Comments
 (0)