From 1a445343f6c045d0d24dd34fc957534cc487f7f8 Mon Sep 17 00:00:00 2001 From: MeshCollider Date: Fri, 10 Nov 2017 13:57:53 +1300 Subject: [PATCH 1/8] scripted-diff: Replace #include "" with #include <> (ryanofsky) -BEGIN VERIFY SCRIPT- for f in \ src/*.cpp \ src/*.h \ src/bench/*.cpp \ src/bench/*.h \ src/compat/*.cpp \ src/compat/*.h \ src/consensus/*.cpp \ src/consensus/*.h \ src/crypto/*.cpp \ src/crypto/*.h \ src/crypto/ctaes/*.h \ src/policy/*.cpp \ src/policy/*.h \ src/primitives/*.cpp \ src/primitives/*.h \ src/qt/*.cpp \ src/qt/*.h \ src/qt/test/*.cpp \ src/qt/test/*.h \ src/rpc/*.cpp \ src/rpc/*.h \ src/script/*.cpp \ src/script/*.h \ src/support/*.cpp \ src/support/*.h \ src/support/allocators/*.h \ src/test/*.cpp \ src/test/*.h \ src/wallet/*.cpp \ src/wallet/*.h \ src/wallet/test/*.cpp \ src/wallet/test/*.h \ src/zmq/*.cpp \ src/zmq/*.h do base=${f%/*}/ relbase=${base#src/} sed -i "s:#include \"\(.*\)\"\(.*\):if test -e \$base'\\1'; then echo \"#include <\"\$relbase\"\\1>\\2\"; else echo \"#include <\\1>\\2\"; fi:e" $f done -END VERIFY SCRIPT- --- src/addrdb.cpp | 22 +++---- src/addrdb.h | 4 +- src/addrman.cpp | 8 +-- src/addrman.h | 12 ++-- src/arith_uint256.cpp | 8 +-- src/base58.cpp | 12 ++-- src/base58.h | 10 ++-- src/bech32.cpp | 2 +- src/bench/Examples.cpp | 6 +- src/bench/base58.cpp | 6 +- src/bench/bench.cpp | 4 +- src/bench/bench_bitcoin.cpp | 12 ++-- src/bench/ccoins_caching.cpp | 8 +-- src/bench/checkblock.cpp | 12 ++-- src/bench/checkqueue.cpp | 12 ++-- src/bench/coin_selection.cpp | 4 +- src/bench/crypto_hash.cpp | 20 +++---- src/bench/lockedpool.cpp | 4 +- src/bench/mempool_eviction.cpp | 6 +- src/bench/perf.cpp | 2 +- src/bench/prevector_destructor.cpp | 4 +- src/bench/rollingbloom.cpp | 4 +- src/bench/verify_script.cpp | 12 ++-- src/bitcoin-cli.cpp | 18 +++--- src/bitcoin-tx.cpp | 30 +++++----- src/bitcoind.cpp | 26 ++++---- src/blockencodings.cpp | 20 +++---- src/blockencodings.h | 2 +- src/bloom.cpp | 16 ++--- src/bloom.h | 2 +- src/chain.cpp | 2 +- src/chain.h | 10 ++-- src/chainparams.cpp | 12 ++-- src/chainparams.h | 8 +-- src/chainparamsbase.cpp | 6 +- src/checkpoints.cpp | 12 ++-- src/checkpoints.h | 2 +- src/checkqueue.h | 2 +- src/clientversion.cpp | 6 +- src/clientversion.h | 2 +- src/coins.cpp | 8 +-- src/coins.h | 14 ++--- src/compat.h | 4 +- src/compat/byteswap.h | 2 +- src/compat/endian.h | 4 +- src/compat/glibc_compat.cpp | 2 +- src/compat/glibc_sanity.cpp | 2 +- src/compat/strnlen.cpp | 2 +- src/compressor.cpp | 8 +-- src/compressor.h | 6 +- src/consensus/merkle.cpp | 6 +- src/consensus/merkle.h | 6 +- src/consensus/params.h | 2 +- src/consensus/tx_verify.cpp | 16 ++--- src/consensus/tx_verify.h | 2 +- src/consensus/validation.h | 8 +-- src/core_io.h | 2 +- src/core_memusage.h | 6 +- src/core_read.cpp | 18 +++--- src/core_write.cpp | 24 ++++---- src/crypto/aes.cpp | 6 +- src/crypto/aes.h | 2 +- src/crypto/chacha20.cpp | 4 +- src/crypto/common.h | 4 +- src/crypto/hmac_sha256.cpp | 2 +- src/crypto/hmac_sha256.h | 2 +- src/crypto/hmac_sha512.cpp | 2 +- src/crypto/hmac_sha512.h | 2 +- src/crypto/ripemd160.cpp | 4 +- src/crypto/sha1.cpp | 4 +- src/crypto/sha256.cpp | 4 +- src/crypto/sha512.cpp | 4 +- src/dbwrapper.cpp | 8 +-- src/dbwrapper.h | 14 ++--- src/fs.cpp | 2 +- src/hash.cpp | 8 +-- src/hash.h | 12 ++-- src/httprpc.cpp | 26 ++++---- src/httpserver.cpp | 20 +++---- src/init.cpp | 80 ++++++++++++------------- src/key.cpp | 12 ++-- src/key.h | 8 +-- src/keystore.cpp | 8 +-- src/keystore.h | 10 ++-- src/memusage.h | 2 +- src/merkleblock.cpp | 8 +-- src/merkleblock.h | 8 +-- src/miner.cpp | 46 +++++++------- src/miner.h | 4 +- src/net.cpp | 30 +++++----- src/net.h | 30 +++++----- src/net_processing.cpp | 56 ++++++++--------- src/net_processing.h | 6 +- src/netaddress.cpp | 10 ++-- src/netaddress.h | 6 +- src/netbase.cpp | 16 ++--- src/netbase.h | 8 +-- src/netmessagemaker.h | 4 +- src/noui.cpp | 6 +- src/policy/feerate.cpp | 4 +- src/policy/feerate.h | 4 +- src/policy/fees.cpp | 20 +++---- src/policy/fees.h | 10 ++-- src/policy/policy.cpp | 16 ++--- src/policy/policy.h | 8 +-- src/policy/rbf.cpp | 2 +- src/policy/rbf.h | 2 +- src/pow.cpp | 10 ++-- src/pow.h | 2 +- src/primitives/block.cpp | 10 ++-- src/primitives/block.h | 6 +- src/primitives/transaction.cpp | 8 +-- src/primitives/transaction.h | 8 +-- src/protocol.cpp | 6 +- src/protocol.h | 8 +-- src/pubkey.cpp | 2 +- src/pubkey.h | 6 +- src/qt/addressbookpage.cpp | 18 +++--- src/qt/addresstablemodel.cpp | 10 ++-- src/qt/askpassphrasedialog.cpp | 12 ++-- src/qt/bantablemodel.cpp | 12 ++-- src/qt/bantablemodel.h | 2 +- src/qt/bitcoin.cpp | 50 ++++++++-------- src/qt/bitcoinaddressvalidator.cpp | 4 +- src/qt/bitcoinamountfield.cpp | 10 ++-- src/qt/bitcoinamountfield.h | 2 +- src/qt/bitcoingui.cpp | 46 +++++++------- src/qt/bitcoingui.h | 4 +- src/qt/bitcoinunits.cpp | 4 +- src/qt/bitcoinunits.h | 2 +- src/qt/clientmodel.cpp | 34 +++++------ src/qt/coincontroldialog.cpp | 36 +++++------ src/qt/coincontroldialog.h | 2 +- src/qt/coincontroltreewidget.cpp | 4 +- src/qt/csvmodelwriter.cpp | 2 +- src/qt/editaddressdialog.cpp | 8 +-- src/qt/guiutil.cpp | 36 +++++------ src/qt/guiutil.h | 4 +- src/qt/intro.cpp | 14 ++--- src/qt/modaloverlay.cpp | 8 +-- src/qt/networkstyle.cpp | 4 +- src/qt/notificator.cpp | 4 +- src/qt/notificator.h | 2 +- src/qt/openuridialog.cpp | 8 +-- src/qt/optionsdialog.cpp | 18 +++--- src/qt/optionsmodel.cpp | 26 ++++---- src/qt/optionsmodel.h | 2 +- src/qt/overviewpage.cpp | 26 ++++---- src/qt/overviewpage.h | 2 +- src/qt/paymentrequestplus.cpp | 4 +- src/qt/paymentrequestplus.h | 4 +- src/qt/paymentserver.cpp | 24 ++++---- src/qt/paymentserver.h | 4 +- src/qt/peertablemodel.cpp | 12 ++-- src/qt/peertablemodel.h | 4 +- src/qt/platformstyle.cpp | 4 +- src/qt/qvalidatedlineedit.cpp | 6 +- src/qt/qvaluecombobox.cpp | 2 +- src/qt/receivecoinsdialog.cpp | 24 ++++---- src/qt/receivecoinsdialog.h | 2 +- src/qt/receiverequestdialog.cpp | 16 ++--- src/qt/receiverequestdialog.h | 2 +- src/qt/recentrequeststablemodel.cpp | 12 ++-- src/qt/recentrequeststablemodel.h | 2 +- src/qt/rpcconsole.cpp | 26 ++++---- src/qt/rpcconsole.h | 6 +- src/qt/sendcoinsdialog.cpp | 42 ++++++------- src/qt/sendcoinsdialog.h | 2 +- src/qt/sendcoinsentry.cpp | 18 +++--- src/qt/sendcoinsentry.h | 2 +- src/qt/signverifymessagedialog.cpp | 24 ++++---- src/qt/splashscreen.cpp | 18 +++--- src/qt/test/compattests.cpp | 6 +- src/qt/test/paymentservertests.cpp | 18 +++--- src/qt/test/paymentservertests.h | 2 +- src/qt/test/rpcnestedtests.cpp | 24 ++++---- src/qt/test/rpcnestedtests.h | 4 +- src/qt/test/test_main.cpp | 16 ++--- src/qt/test/uritests.cpp | 6 +- src/qt/test/wallettests.cpp | 36 +++++------ src/qt/trafficgraphwidget.cpp | 4 +- src/qt/transactiondesc.cpp | 30 +++++----- src/qt/transactiondescdialog.cpp | 6 +- src/qt/transactionfilterproxy.cpp | 6 +- src/qt/transactionfilterproxy.h | 2 +- src/qt/transactionrecord.cpp | 12 ++-- src/qt/transactionrecord.h | 4 +- src/qt/transactiontablemodel.cpp | 34 +++++------ src/qt/transactiontablemodel.h | 2 +- src/qt/transactionview.cpp | 34 +++++------ src/qt/transactionview.h | 2 +- src/qt/utilitydialog.cpp | 24 ++++---- src/qt/walletframe.cpp | 6 +- src/qt/walletmodel.cpp | 52 ++++++++-------- src/qt/walletmodel.h | 6 +- src/qt/walletmodeltransaction.cpp | 6 +- src/qt/walletmodeltransaction.h | 2 +- src/qt/walletview.cpp | 36 +++++------ src/qt/walletview.h | 2 +- src/qt/winshutdownmonitor.cpp | 6 +- src/random.cpp | 12 ++-- src/random.h | 6 +- src/rest.cpp | 28 ++++----- src/rpc/blockchain.cpp | 44 +++++++------- src/rpc/client.cpp | 6 +- src/rpc/mining.cpp | 44 +++++++------- src/rpc/mining.h | 2 +- src/rpc/misc.cpp | 38 ++++++------ src/rpc/net.cpp | 36 +++++------ src/rpc/protocol.cpp | 16 ++--- src/rpc/protocol.h | 2 +- src/rpc/rawtransaction.cpp | 50 ++++++++-------- src/rpc/safemode.cpp | 8 +-- src/rpc/server.cpp | 20 +++---- src/rpc/server.h | 6 +- src/scheduler.cpp | 6 +- src/scheduler.h | 2 +- src/script/bitcoinconsensus.cpp | 10 ++-- src/script/bitcoinconsensus.h | 2 +- src/script/interpreter.cpp | 18 +++--- src/script/interpreter.h | 4 +- src/script/ismine.cpp | 12 ++-- src/script/ismine.h | 2 +- src/script/script.cpp | 6 +- src/script/script.h | 6 +- src/script/script_error.cpp | 2 +- src/script/sigcache.cpp | 14 ++--- src/script/sigcache.h | 2 +- src/script/sign.cpp | 16 ++--- src/script/sign.h | 2 +- src/script/standard.cpp | 10 ++-- src/script/standard.h | 4 +- src/serialize.h | 4 +- src/streams.h | 4 +- src/support/allocators/secure.h | 4 +- src/support/allocators/zeroafterfree.h | 2 +- src/support/cleanse.cpp | 2 +- src/support/lockedpool.cpp | 6 +- src/sync.cpp | 6 +- src/sync.h | 2 +- src/test/DoS_tests.cpp | 22 +++---- src/test/addrman_tests.cpp | 10 ++-- src/test/allocator_tests.cpp | 6 +- src/test/amount_tests.cpp | 6 +- src/test/arith_uint256_tests.cpp | 8 +-- src/test/base32_tests.cpp | 4 +- src/test/base58_tests.cpp | 24 ++++---- src/test/base64_tests.cpp | 4 +- src/test/bech32_tests.cpp | 4 +- src/test/bip32_tests.cpp | 12 ++-- src/test/blockencodings_tests.cpp | 10 ++-- src/test/bloom_tests.cpp | 28 ++++----- src/test/bswap_tests.cpp | 4 +- src/test/checkqueue_tests.cpp | 12 ++-- src/test/coins_tests.cpp | 16 ++--- src/test/compress_tests.cpp | 6 +- src/test/crypto_tests.cpp | 22 +++---- src/test/cuckoocache_tests.cpp | 8 +-- src/test/dbwrapper_tests.cpp | 8 +-- src/test/getarg_tests.cpp | 4 +- src/test/hash_tests.cpp | 6 +- src/test/key_tests.cpp | 16 ++--- src/test/limitedmap_tests.cpp | 4 +- src/test/main_tests.cpp | 8 +-- src/test/mempool_tests.cpp | 8 +-- src/test/merkle_tests.cpp | 4 +- src/test/merkleblock_tests.cpp | 6 +- src/test/miner_tests.cpp | 34 +++++------ src/test/multisig_tests.cpp | 20 +++---- src/test/net_tests.cpp | 18 +++--- src/test/netbase_tests.cpp | 6 +- src/test/pmt_tests.cpp | 16 ++--- src/test/policyestimator_tests.cpp | 12 ++-- src/test/pow_tests.cpp | 12 ++-- src/test/prevector_tests.cpp | 10 ++-- src/test/raii_event_tests.cpp | 4 +- src/test/random_tests.cpp | 4 +- src/test/reverselock_tests.cpp | 4 +- src/test/rpc_tests.cpp | 12 ++-- src/test/sanity_tests.cpp | 6 +- src/test/scheduler_tests.cpp | 6 +- src/test/script_P2SH_tests.cpp | 22 +++---- src/test/script_standard_tests.cpp | 14 ++--- src/test/script_tests.cpp | 26 ++++---- src/test/scriptnum10.h | 2 +- src/test/scriptnum_tests.cpp | 6 +- src/test/serialize_tests.cpp | 8 +-- src/test/sighash_tests.cpp | 24 ++++---- src/test/sigopcount_tests.cpp | 16 ++--- src/test/skiplist_tests.cpp | 6 +- src/test/streams_tests.cpp | 6 +- src/test/test_bitcoin.cpp | 40 ++++++------- src/test/test_bitcoin.h | 16 ++--- src/test/test_bitcoin_fuzzy.cpp | 30 +++++----- src/test/test_bitcoin_main.cpp | 2 +- src/test/timedata_tests.cpp | 4 +- src/test/torcontrol_tests.cpp | 4 +- src/test/transaction_tests.cpp | 36 +++++------ src/test/txvalidationcache_tests.cpp | 28 ++++----- src/test/uint256_tests.cpp | 8 +-- src/test/univalue_tests.cpp | 2 +- src/test/util_tests.cpp | 16 ++--- src/test/versionbits_tests.cpp | 12 ++-- src/threadinterrupt.cpp | 2 +- src/timedata.cpp | 16 ++--- src/torcontrol.cpp | 12 ++-- src/torcontrol.h | 2 +- src/txdb.cpp | 20 +++---- src/txdb.h | 6 +- src/txmempool.cpp | 28 ++++----- src/txmempool.h | 14 ++--- src/ui_interface.cpp | 4 +- src/uint256.cpp | 4 +- src/uint256.h | 2 +- src/undo.h | 8 +-- src/util.cpp | 16 ++--- src/util.h | 12 ++-- src/utilmoneystr.cpp | 8 +-- src/utilmoneystr.h | 2 +- src/utilstrencodings.cpp | 4 +- src/utiltime.cpp | 4 +- src/validation.cpp | 76 +++++++++++------------ src/validation.h | 18 +++--- src/validationinterface.cpp | 16 ++--- src/validationinterface.h | 2 +- src/versionbits.cpp | 4 +- src/versionbits.h | 2 +- src/wallet/coincontrol.h | 8 +-- src/wallet/crypter.cpp | 12 ++-- src/wallet/crypter.h | 6 +- src/wallet/db.cpp | 16 ++--- src/wallet/db.h | 12 ++-- src/wallet/feebumper.cpp | 26 ++++---- src/wallet/fees.cpp | 14 ++--- src/wallet/fees.h | 2 +- src/wallet/init.cpp | 16 ++--- src/wallet/rpcdump.cpp | 32 +++++----- src/wallet/rpcwallet.cpp | 46 +++++++------- src/wallet/test/accounting_tests.cpp | 4 +- src/wallet/test/crypto_tests.cpp | 6 +- src/wallet/test/wallet_test_fixture.cpp | 8 +-- src/wallet/test/wallet_test_fixture.h | 2 +- src/wallet/test/wallet_tests.cpp | 14 ++--- src/wallet/wallet.cpp | 56 ++++++++--------- src/wallet/wallet.h | 24 ++++---- src/wallet/walletdb.cpp | 24 ++++---- src/wallet/walletdb.h | 8 +-- src/warnings.cpp | 8 +-- src/zmq/zmqabstractnotifier.cpp | 4 +- src/zmq/zmqabstractnotifier.h | 2 +- src/zmq/zmqconfig.h | 6 +- src/zmq/zmqnotificationinterface.cpp | 12 ++-- src/zmq/zmqnotificationinterface.h | 2 +- src/zmq/zmqpublishnotifier.cpp | 14 ++--- src/zmq/zmqpublishnotifier.h | 2 +- 355 files changed, 2046 insertions(+), 2046 deletions(-) diff --git a/src/addrdb.cpp b/src/addrdb.cpp index 7f85c1658..0f9ccf1e9 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -3,17 +3,17 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "addrdb.h" - -#include "addrman.h" -#include "chainparams.h" -#include "clientversion.h" -#include "fs.h" -#include "hash.h" -#include "random.h" -#include "streams.h" -#include "tinyformat.h" -#include "util.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/src/addrdb.h b/src/addrdb.h index d930de204..098da4240 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -6,8 +6,8 @@ #ifndef BITCOIN_ADDRDB_H #define BITCOIN_ADDRDB_H -#include "fs.h" -#include "serialize.h" +#include +#include #include #include diff --git a/src/addrman.cpp b/src/addrman.cpp index a56bb4f9c..ddcdf4c2f 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -3,11 +3,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "addrman.h" +#include -#include "hash.h" -#include "serialize.h" -#include "streams.h" +#include +#include +#include int CAddrInfo::GetTriedBucket(const uint256& nKey) const { diff --git a/src/addrman.h b/src/addrman.h index f347cba6c..b06b27296 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -6,12 +6,12 @@ #ifndef BITCOIN_ADDRMAN_H #define BITCOIN_ADDRMAN_H -#include "netaddress.h" -#include "protocol.h" -#include "random.h" -#include "sync.h" -#include "timedata.h" -#include "util.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index b4952af6f..738224fb7 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -3,11 +3,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "arith_uint256.h" +#include -#include "uint256.h" -#include "utilstrencodings.h" -#include "crypto/common.h" +#include +#include +#include #include #include diff --git a/src/base58.cpp b/src/base58.cpp index 9d5a2f496..cd087e799 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "base58.h" +#include -#include "bech32.h" -#include "hash.h" -#include "script/script.h" -#include "uint256.h" -#include "utilstrencodings.h" +#include +#include +#include