- ensures a consistent usage in header files - also add a blank line after the copyright header where missing - also remove orphan new-lines at the end of some filestags/v0.15.1
@@ -3,7 +3,7 @@ | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef _BITCOIN_ADDRMAN | |||
#define _BITCOIN_ADDRMAN 1 | |||
#define _BITCOIN_ADDRMAN | |||
#include "netbase.h" | |||
#include "protocol.h" | |||
@@ -503,4 +503,4 @@ public: | |||
} | |||
}; | |||
#endif | |||
#endif // _BITCOIN_ADDRMAN |
@@ -4,7 +4,7 @@ | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef _BITCOINALERT_H_ | |||
#define _BITCOINALERT_H_ 1 | |||
#define _BITCOINALERT_H_ | |||
#include "serialize.h" | |||
#include "sync.h" | |||
@@ -105,4 +105,4 @@ public: | |||
static CAlert getAlertByHash(const uint256 &hash); | |||
}; | |||
#endif | |||
#endif // _BITCOINALERT_H_ |
@@ -252,4 +252,4 @@ struct zero_after_free_allocator : public std::allocator<T> | |||
// This is exactly like std::string, but with a custom allocator. | |||
typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; | |||
#endif | |||
#endif // BITCOIN_ALLOCATORS_H |
@@ -619,4 +619,3 @@ int main(int argc, char* argv[]) | |||
} | |||
return ret; | |||
} | |||
@@ -91,4 +91,4 @@ public: | |||
void UpdateEmptyFull(); | |||
}; | |||
#endif /* BITCOIN_BLOOM_H */ | |||
#endif // BITCOIN_BLOOM_H |
@@ -120,4 +120,4 @@ void SelectParams(CBaseChainParams::Network network); | |||
*/ | |||
bool SelectParamsFromCommandLine(); | |||
#endif | |||
#endif // BITCOIN_CHAIN_PARAMS_H |
@@ -55,4 +55,4 @@ bool SelectBaseParamsFromCommandLine(); | |||
*/ | |||
bool AreBaseParamsConfigured(); | |||
#endif | |||
#endif // BITCOIN_CHAIN_PARAMS_BASE_H |
@@ -30,4 +30,4 @@ namespace Checkpoints { | |||
} //namespace Checkpoints | |||
#endif | |||
#endif // BITCOIN_CHECKPOINT_H |
@@ -191,4 +191,4 @@ public: | |||
} | |||
}; | |||
#endif | |||
#endif // CHECKQUEUE_H |
@@ -2,6 +2,7 @@ | |||
// Copyright (c) 2009-2013 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_COINS_H | |||
#define BITCOIN_COINS_H | |||
@@ -379,4 +380,4 @@ private: | |||
CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const; | |||
}; | |||
#endif | |||
#endif // BITCOIN_COINS_H |
@@ -533,4 +533,4 @@ struct CBlockLocator | |||
} | |||
}; | |||
#endif | |||
#endif // BITCOIN_CORE_H |
@@ -126,4 +126,3 @@ vector<unsigned char> ParseHexUV(const UniValue& v, const string& strName) | |||
throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')"); | |||
return ParseHex(strHex); | |||
} | |||
@@ -89,4 +89,3 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry) | |||
if (hashBlock != 0) | |||
entry.pushKV("blockhash", hashBlock.GetHex()); | |||
} | |||
@@ -192,4 +192,4 @@ public: | |||
boost::signals2::signal<void (CCryptoKeyStore* wallet)> NotifyStatusChanged; | |||
}; | |||
#endif | |||
#endif // __CRYPTER_H__ |
@@ -159,4 +159,4 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL | |||
unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash); | |||
#endif | |||
#endif // BITCOIN_HASH_H |
@@ -33,4 +33,4 @@ std::string HelpMessage(HelpMessageMode mode); | |||
/** Returns licensing information (for -version) */ | |||
std::string LicenseInfo(); | |||
#endif | |||
#endif // BITCOIN_INIT_H |
@@ -309,4 +309,4 @@ struct CExtKey { | |||
/** Check that required EC support is available at runtime */ | |||
bool ECC_InitSanityCheck(void); | |||
#endif | |||
#endif // BITCOIN_KEY_H |
@@ -105,4 +105,4 @@ public: | |||
typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; | |||
typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap; | |||
#endif | |||
#endif // BITCOIN_KEYSTORE_H |
@@ -98,4 +98,4 @@ public: | |||
} | |||
}; | |||
#endif | |||
#endif // BITCOIN_LIMITEDMAP_H |
@@ -1056,4 +1056,4 @@ protected: | |||
friend void ::UnregisterAllWallets(); | |||
}; | |||
#endif | |||
#endif // BITCOIN_MAIN_H |
@@ -64,4 +64,4 @@ public: | |||
} | |||
}; | |||
#endif | |||
#endif // BITCOIN_MRUSET_H |
@@ -615,4 +615,4 @@ public: | |||
bool Read(CAddrMan& addr); | |||
}; | |||
#endif | |||
#endif // BITCOIN_NET_H |
@@ -182,4 +182,4 @@ bool CloseSocket(SOCKET& hSocket); | |||
/** Disable or enable blocking-mode for a socket */ | |||
bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking); | |||
#endif | |||
#endif // BITCOIN_NETBASE_H |
@@ -7,4 +7,4 @@ | |||
extern void noui_connect(); | |||
#endif | |||
#endif // BITCOIN_NOUI_H |
@@ -1,4 +1,3 @@ | |||
// Copyright (c) 2009-2010 Satoshi Nakamoto | |||
// Copyright (c) 2009-2014 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
@@ -24,4 +23,4 @@ void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev); | |||
uint256 GetProofIncrement(unsigned int nBits); | |||
#endif | |||
#endif // BITCOIN_POW_H |
@@ -4,7 +4,7 @@ | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef _BITCOINRPC_CLIENT_H_ | |||
#define _BITCOINRPC_CLIENT_H_ 1 | |||
#define _BITCOINRPC_CLIENT_H_ | |||
#include "json/json_spirit_reader_template.h" | |||
#include "json/json_spirit_utils.h" | |||
@@ -12,4 +12,4 @@ | |||
json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams); | |||
#endif | |||
#endif // _BITCOINRPC_CLIENT_H_ |
@@ -4,7 +4,7 @@ | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef _BITCOINRPC_PROTOCOL_H_ | |||
#define _BITCOINRPC_PROTOCOL_H_ 1 | |||
#define _BITCOINRPC_PROTOCOL_H_ | |||
#include <list> | |||
#include <map> | |||
@@ -159,4 +159,4 @@ json_spirit::Object JSONRPCReplyObj(const json_spirit::Value& result, const json | |||
std::string JSONRPCReply(const json_spirit::Value& result, const json_spirit::Value& error, const json_spirit::Value& id); | |||
json_spirit::Object JSONRPCError(int code, const std::string& message); | |||
#endif | |||
#endif // _BITCOINRPC_PROTOCOL_H_ |
@@ -4,7 +4,7 @@ | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef _BITCOINRPC_SERVER_H_ | |||
#define _BITCOINRPC_SERVER_H_ 1 | |||
#define _BITCOINRPC_SERVER_H_ | |||
#include "uint256.h" | |||
#include "rpcprotocol.h" | |||
@@ -209,4 +209,4 @@ extern json_spirit::Value gettxout(const json_spirit::Array& params, bool fHelp) | |||
extern json_spirit::Value verifychain(const json_spirit::Array& params, bool fHelp); | |||
extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp); | |||
#endif | |||
#endif // _BITCOINRPC_SERVER_H_ |
@@ -833,4 +833,4 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C | |||
// combine them intelligently and return the result. | |||
CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); | |||
#endif | |||
#endif // H_BITCOIN_SCRIPT |
@@ -1405,4 +1405,4 @@ public: | |||
} | |||
}; | |||
#endif | |||
#endif // BITCOIN_SERIALIZE_H |
@@ -260,5 +260,5 @@ public: | |||
return fHaveGrant; | |||
} | |||
}; | |||
#endif | |||
#endif // BITCOIN_SYNC_H |
@@ -51,4 +51,5 @@ | |||
#define SHARED_LOCKS_REQUIRED(...) | |||
#define NO_THREAD_SAFETY_ANALYSIS | |||
#endif // __GNUC__ | |||
#endif // BITCOIN_THREADSAFETY_H |
@@ -73,4 +73,4 @@ int64_t GetTimeOffset(); | |||
int64_t GetAdjustedTime(); | |||
void AddTimeData(const CNetAddr& ip, int64_t nTime); | |||
#endif | |||
#endif // BITCOIN_TIMEDATA_H |
@@ -2,6 +2,7 @@ | |||
// Copyright (c) 2009-2013 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_TXMEMPOOL_H | |||
#define BITCOIN_TXMEMPOOL_H | |||
@@ -147,4 +148,4 @@ public: | |||
bool HaveCoins(const uint256 &txid) const; | |||
}; | |||
#endif /* BITCOIN_TXMEMPOOL_H */ | |||
#endif // BITCOIN_TXMEMPOOL_H |
@@ -109,4 +109,4 @@ inline std::string _(const char* psz) | |||
return rv ? (*rv) : psz; | |||
} | |||
#endif | |||
#endif // BITCOIN_UI_INTERFACE_H |
@@ -326,4 +326,4 @@ public: | |||
uint64_t GetHash(const uint256& salt) const; | |||
}; | |||
#endif | |||
#endif // BITCOIN_UINT256_H |
@@ -222,4 +222,4 @@ template <typename Callable> void TraceThread(const char* name, Callable func) | |||
} | |||
} | |||
#endif | |||
#endif // BITCOIN_UTIL_H |
@@ -17,4 +17,4 @@ void MilliSleep(int64_t n); | |||
std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime); | |||
#endif | |||
#endif // BITCOIN_UTILTIME_H |
@@ -1,6 +1,7 @@ | |||
// Copyright (c) 2012 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_VERSION_H | |||
#define BITCOIN_VERSION_H | |||
@@ -52,4 +53,4 @@ static const int MEMPOOL_GD_VERSION = 60002; | |||
std::string FormatFullVersion(); | |||
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); | |||
#endif | |||
#endif // BITCOIN_VERSION_H |
@@ -2,6 +2,7 @@ | |||
// Copyright (c) 2009-2013 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_WALLET_H | |||
#define BITCOIN_WALLET_H | |||
@@ -955,4 +956,4 @@ private: | |||
std::vector<char> _ssExtra; | |||
}; | |||
#endif | |||
#endif // BITCOIN_WALLET_H |
@@ -2,6 +2,7 @@ | |||
// Copyright (c) 2009-2013 The Bitcoin developers | |||
// Distributed under the MIT/X11 software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_WALLETDB_H | |||
#define BITCOIN_WALLETDB_H | |||