merge bitcoin#23524: Fix typos in endif header comments

src/banman.h

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

src/coinjoin/common.h

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

src/context.h

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

src/evo/creditpool.h

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

src/governance/common.h

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

src/httprpc.h

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

src/i2p.h

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

src/node/psbt.h

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

src/randomenv.h

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

src/rpc/blockchain.h

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

src/rpc/index_util.h

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

src/scheduler.h

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

src/shutdown.h

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

src/span.h

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

src/test/scriptnum10.h

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

src/test/util/setup_common.h

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

src/torcontrol.h

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

src/util/edge.h

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

src/util/readwritefile.h

@@ -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);
 
-#endif /* BITCOIN_UTIL_READWRITEFILE_H */
+#endif // BITCOIN_UTIL_READWRITEFILE_H

src/util/trace.h

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

src/util/wpipe.h

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

src/zmq/zmqrpc.h

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

test/lint/lint-include-guards.sh

@@ -17,7 +17,7 @@ for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_W
 do
     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}"
-    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 "  #ifndef ${HEADER_ID}"
         echo "  #define ${HEADER_ID}"