Browse Source

add missing header end comments

- 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 files
0.10
Philip Kaufmann 10 years ago
parent
commit
093303a887
  1. 4
      src/addrman.h
  2. 4
      src/alert.h
  3. 2
      src/allocators.h
  4. 1
      src/bitcoin-tx.cpp
  5. 2
      src/bloom.h
  6. 2
      src/chainparams.h
  7. 2
      src/chainparamsbase.h
  8. 2
      src/checkpoints.h
  9. 2
      src/checkqueue.h
  10. 3
      src/coins.h
  11. 2
      src/core.h
  12. 1
      src/core_read.cpp
  13. 1
      src/core_write.cpp
  14. 2
      src/crypter.h
  15. 2
      src/hash.h
  16. 2
      src/init.h
  17. 2
      src/key.h
  18. 2
      src/keystore.h
  19. 2
      src/limitedmap.h
  20. 2
      src/main.h
  21. 2
      src/mruset.h
  22. 2
      src/net.h
  23. 2
      src/netbase.h
  24. 2
      src/noui.h
  25. 3
      src/pow.h
  26. 4
      src/rpcclient.h
  27. 4
      src/rpcprotocol.h
  28. 4
      src/rpcserver.h
  29. 2
      src/script.h
  30. 2
      src/serialize.h
  31. 2
      src/sync.h
  32. 1
      src/threadsafety.h
  33. 2
      src/timedata.h
  34. 3
      src/txmempool.h
  35. 2
      src/ui_interface.h
  36. 2
      src/uint256.h
  37. 2
      src/util.h
  38. 2
      src/utiltime.h
  39. 3
      src/version.h
  40. 3
      src/wallet.h
  41. 1
      src/walletdb.h

4
src/addrman.h

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef _BITCOIN_ADDRMAN #ifndef _BITCOIN_ADDRMAN
#define _BITCOIN_ADDRMAN 1 #define _BITCOIN_ADDRMAN
#include "netbase.h" #include "netbase.h"
#include "protocol.h" #include "protocol.h"
@ -503,4 +503,4 @@ public:
} }
}; };
#endif #endif // _BITCOIN_ADDRMAN

4
src/alert.h

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef _BITCOINALERT_H_ #ifndef _BITCOINALERT_H_
#define _BITCOINALERT_H_ 1 #define _BITCOINALERT_H_
#include "serialize.h" #include "serialize.h"
#include "sync.h" #include "sync.h"
@ -105,4 +105,4 @@ public:
static CAlert getAlertByHash(const uint256 &hash); static CAlert getAlertByHash(const uint256 &hash);
}; };
#endif #endif // _BITCOINALERT_H_

2
src/allocators.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. // This is exactly like std::string, but with a custom allocator.
typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
#endif #endif // BITCOIN_ALLOCATORS_H

1
src/bitcoin-tx.cpp

@ -619,4 +619,3 @@ int main(int argc, char* argv[])
} }
return ret; return ret;
} }

2
src/bloom.h

@ -91,4 +91,4 @@ public:
void UpdateEmptyFull(); void UpdateEmptyFull();
}; };
#endif /* BITCOIN_BLOOM_H */ #endif // BITCOIN_BLOOM_H

2
src/chainparams.h

@ -120,4 +120,4 @@ void SelectParams(CBaseChainParams::Network network);
*/ */
bool SelectParamsFromCommandLine(); bool SelectParamsFromCommandLine();
#endif #endif // BITCOIN_CHAIN_PARAMS_H

2
src/chainparamsbase.h

@ -55,4 +55,4 @@ bool SelectBaseParamsFromCommandLine();
*/ */
bool AreBaseParamsConfigured(); bool AreBaseParamsConfigured();
#endif #endif // BITCOIN_CHAIN_PARAMS_BASE_H

2
src/checkpoints.h

@ -30,4 +30,4 @@ namespace Checkpoints {
} //namespace Checkpoints } //namespace Checkpoints
#endif #endif // BITCOIN_CHECKPOINT_H

2
src/checkqueue.h

@ -191,4 +191,4 @@ public:
} }
}; };
#endif #endif // CHECKQUEUE_H

3
src/coins.h

@ -2,6 +2,7 @@
// Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2009-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_COINS_H #ifndef BITCOIN_COINS_H
#define BITCOIN_COINS_H #define BITCOIN_COINS_H
@ -379,4 +380,4 @@ private:
CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const; CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const;
}; };
#endif #endif // BITCOIN_COINS_H

2
src/core.h

@ -533,4 +533,4 @@ struct CBlockLocator
} }
}; };
#endif #endif // BITCOIN_CORE_H

1
src/core_read.cpp

@ -126,4 +126,3 @@ vector<unsigned char> ParseHexUV(const UniValue& v, const string& strName)
throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')"); throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')");
return ParseHex(strHex); return ParseHex(strHex);
} }

1
src/core_write.cpp

@ -89,4 +89,3 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
if (hashBlock != 0) if (hashBlock != 0)
entry.pushKV("blockhash", hashBlock.GetHex()); entry.pushKV("blockhash", hashBlock.GetHex());
} }

2
src/crypter.h

@ -192,4 +192,4 @@ public:
boost::signals2::signal<void (CCryptoKeyStore* wallet)> NotifyStatusChanged; boost::signals2::signal<void (CCryptoKeyStore* wallet)> NotifyStatusChanged;
}; };
#endif #endif // __CRYPTER_H__

2
src/hash.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); unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash);
#endif #endif // BITCOIN_HASH_H

2
src/init.h

@ -33,4 +33,4 @@ std::string HelpMessage(HelpMessageMode mode);
/** Returns licensing information (for -version) */ /** Returns licensing information (for -version) */
std::string LicenseInfo(); std::string LicenseInfo();
#endif #endif // BITCOIN_INIT_H

2
src/key.h

@ -309,4 +309,4 @@ struct CExtKey {
/** Check that required EC support is available at runtime */ /** Check that required EC support is available at runtime */
bool ECC_InitSanityCheck(void); bool ECC_InitSanityCheck(void);
#endif #endif // BITCOIN_KEY_H

2
src/keystore.h

@ -105,4 +105,4 @@ public:
typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap; typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap;
#endif #endif // BITCOIN_KEYSTORE_H

2
src/limitedmap.h

@ -98,4 +98,4 @@ public:
} }
}; };
#endif #endif // BITCOIN_LIMITEDMAP_H

2
src/main.h

@ -1056,4 +1056,4 @@ protected:
friend void ::UnregisterAllWallets(); friend void ::UnregisterAllWallets();
}; };
#endif #endif // BITCOIN_MAIN_H

2
src/mruset.h

@ -64,4 +64,4 @@ public:
} }
}; };
#endif #endif // BITCOIN_MRUSET_H

2
src/net.h

@ -615,4 +615,4 @@ public:
bool Read(CAddrMan& addr); bool Read(CAddrMan& addr);
}; };
#endif #endif // BITCOIN_NET_H

2
src/netbase.h

@ -182,4 +182,4 @@ bool CloseSocket(SOCKET& hSocket);
/** Disable or enable blocking-mode for a socket */ /** Disable or enable blocking-mode for a socket */
bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking); bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking);
#endif #endif // BITCOIN_NETBASE_H

2
src/noui.h

@ -7,4 +7,4 @@
extern void noui_connect(); extern void noui_connect();
#endif #endif // BITCOIN_NOUI_H

3
src/pow.h

@ -1,4 +1,3 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // 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); uint256 GetProofIncrement(unsigned int nBits);
#endif #endif // BITCOIN_POW_H

4
src/rpcclient.h

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef _BITCOINRPC_CLIENT_H_ #ifndef _BITCOINRPC_CLIENT_H_
#define _BITCOINRPC_CLIENT_H_ 1 #define _BITCOINRPC_CLIENT_H_
#include "json/json_spirit_reader_template.h" #include "json/json_spirit_reader_template.h"
#include "json/json_spirit_utils.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); json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams);
#endif #endif // _BITCOINRPC_CLIENT_H_

4
src/rpcprotocol.h

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef _BITCOINRPC_PROTOCOL_H_ #ifndef _BITCOINRPC_PROTOCOL_H_
#define _BITCOINRPC_PROTOCOL_H_ 1 #define _BITCOINRPC_PROTOCOL_H_
#include <list> #include <list>
#include <map> #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); 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); json_spirit::Object JSONRPCError(int code, const std::string& message);
#endif #endif // _BITCOINRPC_PROTOCOL_H_

4
src/rpcserver.h

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef _BITCOINRPC_SERVER_H_ #ifndef _BITCOINRPC_SERVER_H_
#define _BITCOINRPC_SERVER_H_ 1 #define _BITCOINRPC_SERVER_H_
#include "uint256.h" #include "uint256.h"
#include "rpcprotocol.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 verifychain(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp);
#endif #endif // _BITCOINRPC_SERVER_H_

2
src/script.h

@ -833,4 +833,4 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
// combine them intelligently and return the result. // combine them intelligently and return the result.
CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2);
#endif #endif // H_BITCOIN_SCRIPT

2
src/serialize.h

@ -1405,4 +1405,4 @@ public:
} }
}; };
#endif #endif // BITCOIN_SERIALIZE_H

2
src/sync.h

@ -260,5 +260,5 @@ public:
return fHaveGrant; return fHaveGrant;
} }
}; };
#endif
#endif // BITCOIN_SYNC_H

1
src/threadsafety.h

@ -51,4 +51,5 @@
#define SHARED_LOCKS_REQUIRED(...) #define SHARED_LOCKS_REQUIRED(...)
#define NO_THREAD_SAFETY_ANALYSIS #define NO_THREAD_SAFETY_ANALYSIS
#endif // __GNUC__ #endif // __GNUC__
#endif // BITCOIN_THREADSAFETY_H #endif // BITCOIN_THREADSAFETY_H

2
src/timedata.h

@ -73,4 +73,4 @@ int64_t GetTimeOffset();
int64_t GetAdjustedTime(); int64_t GetAdjustedTime();
void AddTimeData(const CNetAddr& ip, int64_t nTime); void AddTimeData(const CNetAddr& ip, int64_t nTime);
#endif #endif // BITCOIN_TIMEDATA_H

3
src/txmempool.h

@ -2,6 +2,7 @@
// Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2009-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_TXMEMPOOL_H #ifndef BITCOIN_TXMEMPOOL_H
#define BITCOIN_TXMEMPOOL_H #define BITCOIN_TXMEMPOOL_H
@ -147,4 +148,4 @@ public:
bool HaveCoins(const uint256 &txid) const; bool HaveCoins(const uint256 &txid) const;
}; };
#endif /* BITCOIN_TXMEMPOOL_H */ #endif // BITCOIN_TXMEMPOOL_H

2
src/ui_interface.h

@ -109,4 +109,4 @@ inline std::string _(const char* psz)
return rv ? (*rv) : psz; return rv ? (*rv) : psz;
} }
#endif #endif // BITCOIN_UI_INTERFACE_H

2
src/uint256.h

@ -326,4 +326,4 @@ public:
uint64_t GetHash(const uint256& salt) const; uint64_t GetHash(const uint256& salt) const;
}; };
#endif #endif // BITCOIN_UINT256_H

2
src/util.h

@ -222,4 +222,4 @@ template <typename Callable> void TraceThread(const char* name, Callable func)
} }
} }
#endif #endif // BITCOIN_UTIL_H

2
src/utiltime.h

@ -17,4 +17,4 @@ void MilliSleep(int64_t n);
std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime); std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime);
#endif #endif // BITCOIN_UTILTIME_H

3
src/version.h

@ -1,6 +1,7 @@
// Copyright (c) 2012 The Bitcoin developers // Copyright (c) 2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_VERSION_H #ifndef BITCOIN_VERSION_H
#define BITCOIN_VERSION_H #define BITCOIN_VERSION_H
@ -52,4 +53,4 @@ static const int MEMPOOL_GD_VERSION = 60002;
std::string FormatFullVersion(); std::string FormatFullVersion();
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
#endif #endif // BITCOIN_VERSION_H

3
src/wallet.h

@ -2,6 +2,7 @@
// Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2009-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_WALLET_H #ifndef BITCOIN_WALLET_H
#define BITCOIN_WALLET_H #define BITCOIN_WALLET_H
@ -955,4 +956,4 @@ private:
std::vector<char> _ssExtra; std::vector<char> _ssExtra;
}; };
#endif #endif // BITCOIN_WALLET_H

1
src/walletdb.h

@ -2,6 +2,7 @@
// Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2009-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_WALLETDB_H #ifndef BITCOIN_WALLETDB_H
#define BITCOIN_WALLETDB_H #define BITCOIN_WALLETDB_H

Loading…
Cancel
Save