merge bitcoin#23524: Fix typos in endif header comments

This commit is contained in:
Kittywhiskers Van Gogh 2021-11-12 11:19:44 +01:00
parent 1f8c3b5e95
commit fc48a134b5
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
33 changed files with 34 additions and 34 deletions

View File

@ -97,4 +97,4 @@ private:
CRollingBloomFilter m_discouraged GUARDED_BY(m_cs_banned) {50000, 0.000001}; CRollingBloomFilter m_discouraged GUARDED_BY(m_cs_banned) {50000, 0.000001};
}; };
#endif #endif // BITCOIN_BANMAN_H

View File

@ -35,4 +35,4 @@ public:
void Flush(); void Flush();
}; };
#endif//BITCOIN_BATCHEDLOGGER_H #endif // BITCOIN_BATCHEDLOGGER_H

View File

@ -132,4 +132,4 @@ constexpr int CalculateAmountPriority(CAmount nInputAmount)
} // namespace CoinJoin } // namespace CoinJoin
#endif #endif // BITCOIN_COINJOIN_COMMON_H

View File

@ -26,4 +26,4 @@ static constexpr CAmount COIN = 100000000;
static constexpr CAmount MAX_MONEY = 21000000 * COIN; static constexpr CAmount MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
#endif // BITCOIN_CONSENSUS_AMOUNT_H #endif // BITCOIN_CONSENSUS_AMOUNT_H

View File

@ -33,4 +33,4 @@ T* GetContext(const CoreContext& context) noexcept
: nullptr; : nullptr;
} }
#endif // BITCOIN_CONTEXT_VARIANT_H #endif // BITCOIN_CONTEXT_H

View File

@ -141,4 +141,4 @@ std::optional<CCreditPoolDiff> GetCreditPoolDiffForBlock(CCreditPoolManager& cpo
const CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams, const CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams,
const CAmount blockSubsidy, BlockValidationState& state); const CAmount blockSubsidy, BlockValidationState& state);
#endif #endif // BITCOIN_EVO_CREDITPOOL_H

View File

@ -377,4 +377,4 @@ public:
}; };
#endif //BITCOIN_EVO_DMNSTATE_H #endif // BITCOIN_EVO_DMNSTATE_H

View File

@ -81,6 +81,6 @@ public:
} }
} }
}; };
} // namespace Governance } // namespace Governance
#endif
#endif // BITCOIN_GOVERNANCE_COMMON_H

View File

@ -31,4 +31,4 @@ void InterruptREST();
*/ */
void StopREST(); void StopREST();
#endif #endif // BITCOIN_HTTPRPC_H

View File

@ -286,4 +286,4 @@ private:
} // namespace sam } // namespace sam
} // namespace i2p } // namespace i2p
#endif /* BITCOIN_I2P_H */ #endif // BITCOIN_I2P_H

View File

@ -233,4 +233,4 @@ extern std::unique_ptr<CQuorumSnapshotManager> quorumSnapshotManager;
} // namespace llmq } // namespace llmq
#endif //BITCOIN_LLMQ_SNAPSHOT_H #endif // BITCOIN_LLMQ_SNAPSHOT_H

View File

@ -50,4 +50,4 @@ struct PSBTAnalysis {
*/ */
PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx); PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx);
#endif // BITCOIN_PSBT_H #endif // BITCOIN_NODE_PSBT_H

View File

@ -66,4 +66,4 @@ public:
SERIALIZE_METHODS(CFeeRate, obj) { READWRITE(obj.nSatoshisPerK); } SERIALIZE_METHODS(CFeeRate, obj) { READWRITE(obj.nSatoshisPerK); }
}; };
#endif // BITCOIN_POLICY_FEERATE_H #endif // BITCOIN_POLICY_FEERATE_H

View File

@ -14,4 +14,4 @@ void RandAddDynamicEnv(CSHA512& hasher);
/** Gather non-cryptographic environment data that does not change over time. */ /** Gather non-cryptographic environment data that does not change over time. */
void RandAddStaticEnv(CSHA512& hasher); void RandAddStaticEnv(CSHA512& hasher);
#endif #endif // BITCOIN_RANDOMENV_H

View File

@ -64,4 +64,4 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
*/ */
UniValue CreateUTXOSnapshot(NodeContext& node, CChainState& chainstate, CAutoFile& afile); UniValue CreateUTXOSnapshot(NodeContext& node, CChainState& chainstate, CAutoFile& afile);
#endif #endif // BITCOIN_RPC_BLOCKCHAIN_H

View File

@ -42,4 +42,4 @@ bool GetTimestampIndex(CBlockTreeDB& block_tree_db, const uint32_t high, const u
std::vector<uint256>& hashes) std::vector<uint256>& hashes)
EXCLUSIVE_LOCKS_REQUIRED(::cs_main); EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
#endif // BITCOIN_RPC_CLIENT_H #endif // BITCOIN_RPC_INDEX_UTIL_H

View File

@ -152,4 +152,4 @@ public:
size_t CallbacksPending() EXCLUSIVE_LOCKS_REQUIRED(!m_callbacks_mutex); size_t CallbacksPending() EXCLUSIVE_LOCKS_REQUIRED(!m_callbacks_mutex);
}; };
#endif #endif // BITCOIN_SCHEDULER_H

View File

@ -36,4 +36,4 @@ bool RestartRequested();
*/ */
void WaitForShutdown(); void WaitForShutdown();
#endif #endif // BITCOIN_SHUTDOWN_H

View File

@ -295,4 +295,4 @@ template<typename C>
return span.end(); return span.end();
} }
#endif #endif // BITCOIN_SPAN_H

View File

@ -37,4 +37,4 @@ inline std::string GetExceptionWhat(const T& e)
void RegisterPrettyTerminateHander(); void RegisterPrettyTerminateHander();
void RegisterPrettySignalHandlers(); void RegisterPrettySignalHandlers();
#endif//BITCOIN_STACKTRACES_H #endif // BITCOIN_STACKTRACES_H

View File

@ -179,4 +179,4 @@ private:
}; };
#endif // BITCOIN_TEST_BIGNUM_H #endif // BITCOIN_TEST_SCRIPTNUM10_H

View File

@ -250,4 +250,4 @@ private:
// define an implicit conversion here so that uint256 may be used directly in BOOST_CHECK_* // define an implicit conversion here so that uint256 may be used directly in BOOST_CHECK_*
std::ostream& operator<<(std::ostream& os, const uint256& num); std::ostream& operator<<(std::ostream& os, const uint256& num);
#endif #endif // BITCOIN_TEST_UTIL_SETUP_COMMON_H

View File

@ -32,4 +32,4 @@ private:
std::atomic<bool> flag; std::atomic<bool> flag;
}; };
#endif //BITCOIN_THREADINTERRUPT_H #endif // BITCOIN_THREADINTERRUPT_H

View File

@ -159,4 +159,4 @@ public:
static void reconnect_cb(evutil_socket_t fd, short what, void *arg); static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
}; };
#endif /* BITCOIN_TORCONTROL_H */ #endif // BITCOIN_TORCONTROL_H

View File

@ -59,4 +59,4 @@ private:
int m_fd{-1}; int m_fd{-1};
}; };
#endif /* BITCOIN_UTIL_EDGE_H */ #endif // BITCOIN_UTIL_EDGE_H

View File

@ -25,4 +25,4 @@ std::pair<bool,std::string> ReadBinaryFile(const fs::path &filename, size_t maxs
*/ */
bool WriteBinaryFile(const fs::path &filename, const std::string &data); bool WriteBinaryFile(const fs::path &filename, const std::string &data);
#endif /* BITCOIN_UTIL_READWRITEFILE_H */ #endif // BITCOIN_UTIL_READWRITEFILE_H

View File

@ -55,4 +55,4 @@
#endif #endif
#endif /* BITCOIN_UTIL_TRACE_H */ #endif // BITCOIN_UTIL_TRACE_H

View File

@ -11,4 +11,4 @@ template <typename E>
return static_cast<typename std::underlying_type<E>::type>(e); return static_cast<typename std::underlying_type<E>::type>(e);
} }
#endif //BITCOIN_UTIL_UNDERLYING_H #endif // BITCOIN_UTIL_UNDERLYING_H

View File

@ -56,4 +56,4 @@ private:
EdgeTriggeredEvents* m_edge_trig_events{nullptr}; EdgeTriggeredEvents* m_edge_trig_events{nullptr};
}; };
#endif /* BITCOIN_UTIL_WPIPE_H */ #endif // BITCOIN_UTIL_WPIPE_H

View File

@ -41,4 +41,4 @@ RPCHelpMan getaddressinfo();
RPCHelpMan getrawchangeaddress(); RPCHelpMan getrawchangeaddress();
RPCHelpMan addmultisigaddress(); RPCHelpMan addmultisigaddress();
RPCHelpMan signrawtransactionwithwallet(); RPCHelpMan signrawtransactionwithwallet();
#endif //BITCOIN_WALLET_RPCWALLET_H #endif // BITCOIN_WALLET_RPCWALLET_H

View File

@ -20,4 +20,4 @@ void SetfLargeWorkInvalidChainFound(bool flag);
*/ */
bilingual_str GetWarnings(bool verbose); bilingual_str GetWarnings(bool verbose);
#endif // BITCOIN_WARNINGS_H #endif // BITCOIN_WARNINGS_H

View File

@ -9,4 +9,4 @@ class CRPCTable;
void RegisterZMQRPCCommands(CRPCTable& t); void RegisterZMQRPCCommands(CRPCTable& t);
#endif // BITCOIN_ZMQ_ZMRRPC_H #endif // BITCOIN_ZMQ_ZMQRPC_H

View File

@ -17,7 +17,7 @@ for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_W
do do
HEADER_ID_BASE=$(cut -f2- -d/ <<< "${HEADER_FILE}" | sed "s/\.h$//g" | tr / _ | tr - _ | tr "[:lower:]" "[:upper:]") HEADER_ID_BASE=$(cut -f2- -d/ <<< "${HEADER_FILE}" | sed "s/\.h$//g" | tr / _ | tr - _ | tr "[:lower:]" "[:upper:]")
HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}" HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}"
if [[ $(grep -cE "^#(ifndef|define) ${HEADER_ID}" "${HEADER_FILE}") != 2 ]]; then if [[ $(grep --count --extended-regexp "^#(ifndef|define|endif //) ${HEADER_ID}" "${HEADER_FILE}") != 3 ]]; then
echo "${HEADER_FILE} seems to be missing the expected include guard:" echo "${HEADER_FILE} seems to be missing the expected include guard:"
echo " #ifndef ${HEADER_ID}" echo " #ifndef ${HEADER_ID}"
echo " #define ${HEADER_ID}" echo " #define ${HEADER_ID}"