fix warnings: unused variable 'XX' [-Wunused-variable]
This commit is contained in:
parent
76d8170ce8
commit
11cd416525
4 changed files with 15 additions and 8 deletions
|
@ -54,9 +54,15 @@ child = Popen(['xgettext','--output=-','-n','--keyword=_'] + files, stdout=PIPE)
|
||||||
messages = parse_po(out)
|
messages = parse_po(out)
|
||||||
|
|
||||||
f = open(OUT_CPP, 'w')
|
f = open(OUT_CPP, 'w')
|
||||||
f.write('#include <QtGlobal>\n')
|
f.write("""#include <QtGlobal>
|
||||||
f.write('// Automatically generated by extract_strings.py\n')
|
// Automatically generated by extract_strings.py
|
||||||
f.write('static const char *bitcoin_strings[] = {')
|
#ifdef __GNUC__
|
||||||
|
#define UNUSED __attribute__((unused))
|
||||||
|
#else
|
||||||
|
#define UNUSED
|
||||||
|
#endif
|
||||||
|
""")
|
||||||
|
f.write('static const char UNUSED *bitcoin_strings[] = {')
|
||||||
for (msgid, msgstr) in messages:
|
for (msgid, msgstr) in messages:
|
||||||
if msgid != EMPTY:
|
if msgid != EMPTY:
|
||||||
f.write('QT_TRANSLATE_NOOP("bitcoin-core", %s),\n' % ('\n'.join(msgid)))
|
f.write('QT_TRANSLATE_NOOP("bitcoin-core", %s),\n' % ('\n'.join(msgid)))
|
||||||
|
|
|
@ -1233,8 +1233,6 @@ void ThreadOpenConnections2(void* parg)
|
||||||
if (fShutdown)
|
if (fShutdown)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool fAddSeeds = false;
|
|
||||||
|
|
||||||
// Add seed nodes if IRC isn't working
|
// Add seed nodes if IRC isn't working
|
||||||
bool fTOR = (fUseProxy && addrProxy.GetPort() == 9050);
|
bool fTOR = (fUseProxy && addrProxy.GetPort() == 9050);
|
||||||
if (addrman.size()==0 && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
|
if (addrman.size()==0 && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
|
||||||
|
@ -1260,7 +1258,6 @@ void ThreadOpenConnections2(void* parg)
|
||||||
// Choose an address to connect to based on most recently seen
|
// Choose an address to connect to based on most recently seen
|
||||||
//
|
//
|
||||||
CAddress addrConnect;
|
CAddress addrConnect;
|
||||||
int64 nBest = std::numeric_limits<int64>::min();
|
|
||||||
|
|
||||||
// Only connect to one address per a.b.?.? range.
|
// Only connect to one address per a.b.?.? range.
|
||||||
// Do this here so we don't have to critsect vNodes inside mapAddresses critsect.
|
// Do this here so we don't have to critsect vNodes inside mapAddresses critsect.
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
// Automatically generated by extract_strings.py
|
// Automatically generated by extract_strings.py
|
||||||
static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", ""
|
#ifdef __GNUC__
|
||||||
|
#define UNUSED __attribute__((unused))
|
||||||
|
#else
|
||||||
|
#define UNUSED
|
||||||
|
#endif
|
||||||
|
static const char UNUSED *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", ""
|
||||||
"Unable to bind to port %d on this computer. Bitcoin is probably already "
|
"Unable to bind to port %d on this computer. Bitcoin is probably already "
|
||||||
"running."),
|
"running."),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low "),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low "),
|
||||||
|
|
|
@ -1443,7 +1443,6 @@ bool ExtractAddresses(const CScript& scriptPubKey, txnouttype& typeRet, vector<C
|
||||||
if (typeRet == TX_MULTISIG)
|
if (typeRet == TX_MULTISIG)
|
||||||
{
|
{
|
||||||
nRequiredRet = vSolutions.front()[0];
|
nRequiredRet = vSolutions.front()[0];
|
||||||
int n = vSolutions.back()[0];
|
|
||||||
for (int i = 1; i < vSolutions.size()-1; i++)
|
for (int i = 1; i < vSolutions.size()-1; i++)
|
||||||
{
|
{
|
||||||
CBitcoinAddress address;
|
CBitcoinAddress address;
|
||||||
|
|
Loading…
Reference in a new issue