sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fa193c6b1b7da8f72a399bfddb1497655ce1685c Add missing includes to fix compile errors (MarcoFalke)
fa09ec83f3f23dacb807c6b6393cabf2a984e4ff 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 fa193c6b1b7da8f72a399bfddb1497655ce1685c -- patch looks correct
  hebasto:
    ACK fa193c6b1b7da8f72a399bfddb1497655ce1685c, 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 committed by PastaPastaPasta
parent 96e488aa03
commit b2080b9c02
3 changed files with 5 additions and 3 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
@ -32,7 +34,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 <primitives/transaction.h> // For CTransactionRef #include <primitives/transaction.h> // For CTransactionRef
#include <util/settings.h> // For util::SettingsValue #include <util/settings.h> // For util::SettingsValue
#include <functional>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <stddef.h> #include <stddef.h>

2
src/qt/coincontroldialog.cpp
View File

@ -461,7 +461,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;
@ -470,7 +469,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());
} }
} }