From 2aa3f890d1efa60fd49f9443274c4fa3ab2a0bee Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Thu, 23 Mar 2017 08:16:14 +0100 Subject: [PATCH] Merge #10029: Fix parameter naming inconsistencies between .h and .cpp files 97b8213 Fix parameter naming inconsistencies between .h and .cpp files (practicalswift) Tree-SHA512: 4f46cc3973a898d2478bdb1b8c8d1829c3a7298b63bc47359c5dc2f135466773072d9672134ef3e7557dfc913720e49b675176b9e435b8bd1992af9ad53866e4 --- src/rpc/server.h | 2 +- src/txmempool.cpp | 2 +- src/txmempool.h | 8 ++++---- src/validation.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rpc/server.h b/src/rpc/server.h index 10d4a94f4..1cbcf2e21 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -66,7 +66,7 @@ void SetRPCWarmupStatus(const std::string& newStatus); void SetRPCWarmupFinished(); /* returns the current warmup state. */ -bool RPCIsInWarmup(std::string *statusOut); +bool RPCIsInWarmup(std::string *outStatus); /** * Type-check arguments; throws JSONRPCError if wrong type given. Does not check that diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 4cfcc21d3..de9c9bdb3 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -111,7 +111,7 @@ void CTxMemPool::UpdateForDescendants(txiter updateIt, cacheMap &cachedDescendan // vHashesToUpdate is the set of transaction hashes from a disconnected block // which has been re-added to the mempool. -// for each entry, look for descendants that are outside hashesToUpdate, and +// for each entry, look for descendants that are outside vHashesToUpdate, and // add fee/size information for such descendants to the parent. // for each such descendant, also update the ancestor state to include the parent. void CTxMemPool::UpdateTransactionsFromBlock(const std::vector &vHashesToUpdate) diff --git a/src/txmempool.h b/src/txmempool.h index bceffd195..3efd35757 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -604,12 +604,12 @@ public: * new mempool entries may have children in the mempool (which is generally * not the case when otherwise adding transactions). * UpdateTransactionsFromBlock() will find child transactions and update the - * descendant state for each transaction in hashesToUpdate (excluding any - * child transactions present in hashesToUpdate, which are already accounted - * for). Note: hashesToUpdate should be the set of transactions from the + * descendant state for each transaction in vHashesToUpdate (excluding any + * child transactions present in vHashesToUpdate, which are already accounted + * for). Note: vHashesToUpdate should be the set of transactions from the * disconnected block that have been accepted back into the mempool. */ - void UpdateTransactionsFromBlock(const std::vector &hashesToUpdate); + void UpdateTransactionsFromBlock(const std::vector &vHashesToUpdate); /** Try to calculate all in-mempool ancestors of entry. * (these are all calculated including the tx itself) diff --git a/src/validation.h b/src/validation.h index 6be85f4ae..3f7aca5fc 100644 --- a/src/validation.h +++ b/src/validation.h @@ -327,7 +327,7 @@ void FlushStateToDisk(); /** Prune block files and flush state to disk. */ void PruneAndFlush(); /** Prune block files up to a given height */ -void PruneBlockFilesManual(int nPruneUpToHeight); +void PruneBlockFilesManual(int nManualPruneHeight); /** (try to) add transaction to memory pool */ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,