phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 04:12:36 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #19299: refactor: Remove unused vars, Add missing includes

Browse source 
fa193c6b1b Add missing includes to fix compile errors (MarcoFalke)
fa09ec83f3 Remove unused variables (MarcoFalke)

Pull request description:

  This is required for #19183, but seems like good cleanup that can go in upfront.

ACKs for top commit:
  practicalswift:
    ACK fa193c6b1b -- patch looks correct
  hebasto:
    ACK fa193c6b1b, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 79b94e7f7ee3a1a8a8fb2ea1ecdf61f130f8b133a37865894da3dbbbf311979e7d1fc013b923fdd7dbf19a221e0232f664defbdb57aa44e0b8c45bfff3c71dcb
This commit is contained in:
fanquake 2020-06-17 16:30:19 +08:00
commit 3faf3429e9
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/fs.cpp
View file

@ -5,10 +5,12 @@
#include <fs.h> #include <fs.h>
#ifndef WIN32 #ifndef WIN32
#include <cstring>
#include <fcntl.h> #include <fcntl.h>
#include <string> #include <string>
#include <sys/file.h> #include <sys/file.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h>
#else #else
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
@ -31,7 +33,8 @@ FILE *fopen(const fs::path& p, const char *mode)
#ifndef WIN32 #ifndef WIN32
static std::string GetErrorReason() { static std::string GetErrorReason()
{
return std::strerror(errno); return std::strerror(errno);
} }

1
src/interfaces/chain.h
View file

@ -8,6 +8,7 @@
#include <optional.h> // For Optional and nullopt #include <optional.h> // For Optional and nullopt
#include <primitives/transaction.h> // For CTransactionRef #include <primitives/transaction.h> // For CTransactionRef
#include <functional>
#include <memory> #include <memory>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
src/qt/coincontroldialog.cpp
View file

@ -400,7 +400,6 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *
// nPayAmount // nPayAmount
CAmount nPayAmount = 0; CAmount nPayAmount = 0;
bool fDust = false; bool fDust = false;
CMutableTransaction txDummy;
for (const CAmount &amount : CoinControlDialog::payAmounts) for (const CAmount &amount : CoinControlDialog::payAmounts)
{ {
nPayAmount += amount; nPayAmount += amount;
@ -409,7 +408,6 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *
{ {
// Assumes a p2pkh script size // Assumes a p2pkh script size
CTxOut txout(amount, CScript() << std::vector<unsigned char>(24, 0)); CTxOut txout(amount, CScript() << std::vector<unsigned char>(24, 0));
txDummy.vout.push_back(txout);
fDust |= IsDust(txout, model->node().getDustRelayFee()); fDust |= IsDust(txout, model->node().getDustRelayFee());
} }
} }

1
src/qt/transactionrecord.cpp
View file

@ -47,7 +47,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
if(mine) if(mine)
{ {
TransactionRecord sub(hash, nTime); TransactionRecord sub(hash, nTime);
CTxDestination address;
sub.idx = i; // vout index sub.idx = i; // vout index
sub.credit = txout.nValue; sub.credit = txout.nValue;
sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY; sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;

1
src/wallet/wallet.cpp
View file

@ -746,7 +746,6 @@ void CWallet::SetSpentKeyState(WalletBatch& batch, const uint256& hash, unsigned
bool CWallet::IsSpentKey(const uint256& hash, unsigned int n) const bool CWallet::IsSpentKey(const uint256& hash, unsigned int n) const
{ {
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);
CTxDestination dst;
const CWalletTx* srctx = GetWalletTx(hash); const CWalletTx* srctx = GetWalletTx(hash);
if (srctx) { if (srctx) {
assert(srctx->tx->vout.size() > n); assert(srctx->tx->vout.size() > n);