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

Merge bitcoin/bitcoin#25115: scripted-diff: replace non-standard fixed width integer types (u_int... -> uint...)

Browse Source 
672d49c863fd6b0f096f166aeb3504f51dfa7d19 scripted-diff: replace non-standard fixed width integer types (`u_int`...` -> `uint`...) (Sebastian Falbesoner)

Pull request description:

  Fixed width integer types prefixed with `u_int` are not part of C++ (see https://en.cppreference.com/w/cpp/types/integer), so it's better to avoid and replace them with their standard-conforming counterparts. (For those interested in history, according to one theory those u_int... types have been introduced by BSD: https://stackoverflow.com/a/5163960, http://lists.freedesktop.org/archives/release-wranglers/2004-August/000923.html).

ACKs for top commit:
  laanwj:
    Code review ACK 672d49c863fd6b0f096f166aeb3504f51dfa7d19
  fanquake:
    ACK 672d49c863fd6b0f096f166aeb3504f51dfa7d19

Tree-SHA512: 68134a0adca0d5c87a7432367cb493491a67288d69a174be2181f8e26efa968d966b9eb1cde94813942405063ee3be2a3437cf2aa5f71375f59205cbdbf501bb
This commit is contained in:
fanquake 2022-05-12 21:07:32 +01:00 committed by pasta
parent e4f8b7097d
commit 90744d0d65
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/validation.cpp
View File

@ -2485,9 +2485,9 @@ bool CChainState::FlushStateToDisk(
full_flush_completed = true; full_flush_completed = true;
TRACE5(utxocache, flush, TRACE5(utxocache, flush,
(int64_t)(GetTimeMicros() - nNow.count()), // in microseconds (µs) (int64_t)(GetTimeMicros() - nNow.count()), // in microseconds (µs)
(u_int32_t)mode, (uint32_t)mode,
(u_int64_t)coins_count, (uint64_t)coins_count,
(u_int64_t)coins_mem_usage, (uint64_t)coins_mem_usage,
(bool)fFlushForPrune); (bool)fFlushForPrune);
} }
} }

4
src/wallet/bdb.cpp
View File

@ -98,7 +98,7 @@ void BerkeleyEnvironment::Close()
if (ret != 0) if (ret != 0)
LogPrintf("BerkeleyEnvironment::Close: Error %d closing database environment: %s\n", ret, DbEnv::strerror(ret)); LogPrintf("BerkeleyEnvironment::Close: Error %d closing database environment: %s\n", ret, DbEnv::strerror(ret));
if (!fMockDb) if (!fMockDb)
DbEnv((u_int32_t)0).remove(strPath.c_str(), 0); DbEnv((uint32_t)0).remove(strPath.c_str(), 0);
if (error_file) fclose(error_file); if (error_file) fclose(error_file);
@ -246,7 +246,7 @@ const void* BerkeleyBatch::SafeDbt::get_data() const
return m_dbt.get_data(); return m_dbt.get_data();
} }
u_int32_t BerkeleyBatch::SafeDbt::get_size() const uint32_t BerkeleyBatch::SafeDbt::get_size() const
{ {
return m_dbt.get_size(); return m_dbt.get_size();
} }

4
src/wallet/bdb.h
View File

@ -34,7 +34,7 @@ static const unsigned int DEFAULT_WALLET_DBLOGSIZE = 100;
static const bool DEFAULT_WALLET_PRIVDB = true; static const bool DEFAULT_WALLET_PRIVDB = true;
struct WalletDatabaseFileId { struct WalletDatabaseFileId {
u_int8_t value[DB_FILE_ID_LEN]; uint8_t value[DB_FILE_ID_LEN];
bool operator==(const WalletDatabaseFileId& rhs) const; bool operator==(const WalletDatabaseFileId& rhs) const;
}; };
@ -182,7 +182,7 @@ class BerkeleyBatch : public DatabaseBatch
// delegate to Dbt // delegate to Dbt
const void* get_data() const; const void* get_data() const;
u_int32_t get_size() const; uint32_t get_size() const;
// conversion operator to access the underlying Dbt // conversion operator to access the underlying Dbt
operator Dbt*(); operator Dbt*();