Browse Source

small headers ordering cleanup

- keep headers in alphabetical order
- fix Makefile.am (2 files in 1 line - leftover)
- remove some spaces etc.
0.10
Philip Kaufmann 11 years ago
parent
commit
c037531d69
  1. 4
      src/net.h
  2. 3
      src/rpcmisc.cpp
  3. 8
      src/rpcrawtransaction.cpp
  4. 2
      src/rpcserver.cpp
  5. 3
      src/test/Makefile.am

4
src/net.h

@ -209,7 +209,7 @@ public:
std::string addrName; std::string addrName;
CService addrLocal; CService addrLocal;
int nVersion; int nVersion;
// strSubVer is whatever byte array we read from the wire. However, this field is intended // strSubVer is whatever byte array we read from the wire. However, this field is intended
// to be printed out, displayed to humans in various forms and so on. So we sanitize it and // to be printed out, displayed to humans in various forms and so on. So we sanitize it and
// store the sanitized version in cleanSubVer. The original should be used when dealing with // store the sanitized version in cleanSubVer. The original should be used when dealing with
// the network or wire types and the cleaned string used when displayed or logged. // the network or wire types and the cleaned string used when displayed or logged.
@ -264,7 +264,7 @@ public:
int64_t nPingUsecStart; int64_t nPingUsecStart;
int64_t nPingUsecTime; int64_t nPingUsecTime;
bool fPingQueued; bool fPingQueued;
CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION) CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION)
{ {
nServices = 0; nServices = 0;

3
src/rpcmisc.cpp

@ -4,11 +4,11 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "base58.h" #include "base58.h"
#include "rpcserver.h"
#include "init.h" #include "init.h"
#include "main.h" #include "main.h"
#include "net.h" #include "net.h"
#include "netbase.h" #include "netbase.h"
#include "rpcserver.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet.h"
@ -323,4 +323,3 @@ Value verifymessage(const Array& params, bool fHelp)
return (pubkey.GetID() == keyID); return (pubkey.GetID() == keyID);
} }

8
src/rpcrawtransaction.cpp

@ -4,13 +4,13 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "base58.h" #include "base58.h"
#include "rpcserver.h" #include "core.h"
#include "init.h" #include "init.h"
#include "keystore.h"
#include "main.h"
#include "net.h" #include "net.h"
#include "rpcserver.h"
#include "uint256.h" #include "uint256.h"
#include "core.h"
#include "main.h"
#include "keystore.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet.h"
#endif #endif

2
src/rpcserver.cpp

@ -8,8 +8,8 @@
#include "base58.h" #include "base58.h"
#include "init.h" #include "init.h"
#include "main.h" #include "main.h"
#include "util.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "util.h"
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
#include "wallet.h" #include "wallet.h"
#endif #endif

3
src/test/Makefile.am

@ -37,7 +37,8 @@ test_bitcoin_SOURCES = \
base58_tests.cpp \ base58_tests.cpp \
base64_tests.cpp \ base64_tests.cpp \
bignum_tests.cpp \ bignum_tests.cpp \
bloom_tests.cpp canonical_tests.cpp \ bloom_tests.cpp \
canonical_tests.cpp \
checkblock_tests.cpp \ checkblock_tests.cpp \
Checkpoints_tests.cpp \ Checkpoints_tests.cpp \
compress_tests.cpp \ compress_tests.cpp \

Loading…
Cancel
Save