Skip to content

Commit 71b400d

Browse files
kwvgkwvg
committed
merge bitcoin#24971: modernize-use-nullptr
1 parent 104ba87 commit 71b400d

File tree

13 files changed

+46
-22
lines changed

13 files changed

+46
-22
lines changed

‎ci/dash/build_src.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cd dashcore-$BUILD_TARGET
5252
bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
5353

5454
if [ "${RUN_TIDY}" = "true" ]; then
55-
MAYBE_BEAR="bear"
55+
MAYBE_BEAR="bear --config src/.bear-tidy-config"
5656
MAYBE_TOKEN="--"
5757
fi
5858

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,6 +1921,7 @@ AC_CONFIG_LINKS([contrib/devtools/test-security-check.py:contrib/devtools/test-s
19211921
AC_CONFIG_LINKS([contrib/devtools/symbol-check.py:contrib/devtools/symbol-check.py])
19221922
AC_CONFIG_LINKS([contrib/devtools/test-symbol-check.py:contrib/devtools/test-symbol-check.py])
19231923
AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
1924+
AC_CONFIG_LINKS([src/.bear-tidy-config:src/.bear-tidy-config])
19241925
AC_CONFIG_LINKS([src/.clang-tidy:src/.clang-tidy])
19251926
AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
19261927
AC_CONFIG_LINKS([test/fuzz/test_runner.py:test/fuzz/test_runner.py])

‎src/.bear-tidy-config‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"output": {
3+
"content": {
4+
"include_only_existing_source": true,
5+
"paths_to_include": [],
6+
"paths_to_exclude": [
7+
"src/crc32",
8+
"src/crypto/x11",
9+
"src/dashbls",
10+
"src/gsl",
11+
"src/immer",
12+
"src/leveldb",
13+
"src/minisketch",
14+
"src/univalue",
15+
"src/secp256k1"
16+
]
17+
},
18+
"format": {
19+
"command_as_array": true,
20+
"drop_output_field": false
21+
}
22+
}
23+
}

‎src/.clang-tidy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Checks: '-*,bugprone-argument-comment'
2-
WarningsAsErrors: bugprone-argument-comment
1+
Checks: '-*,bugprone-argument-comment,modernize-use-nullptr'
2+
WarningsAsErrors: 'bugprone-argument-comment,modernize-use-nullptr'

‎src/mapport.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static bool ProcessUpnp()
195195
std::string strDesc = PACKAGE_NAME " " + FormatFullVersion();
196196

197197
do {
198-
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0, "0");
198+
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", nullptr, "0");
199199

200200
if (r != UPNPCOMMAND_SUCCESS) {
201201
ret = false;
@@ -208,7 +208,7 @@ static bool ProcessUpnp()
208208
} while (g_mapport_interrupt.sleep_for(PORT_MAPPING_REANNOUNCE_PERIOD));
209209
g_mapport_interrupt.reset();
210210

211-
r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0);
211+
r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", nullptr);
212212
LogPrintf("UPNP_DeletePortMapping() returned: %d\n", r);
213213
freeUPNPDevlist(devlist); devlist = nullptr;
214214
FreeUPNPUrls(&urls);

‎src/netbase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ bool ConnectThroughProxy(const Proxy& proxy, const std::string& strDest, uint16_
658658
return false;
659659
}
660660
} else {
661-
if (!Socks5(strDest, port, 0, sock)) {
661+
if (!Socks5(strDest, port, nullptr, sock)) {
662662
return false;
663663
}
664664
}

‎src/qt/bitcoin.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ int GuiMain(int argc, char* argv[])
532532
if (gArgs.IsArgSet("-printcrashinfo")) {
533533
auto crashInfo = GetCrashInfoStrFromSerializedStr(gArgs.GetArg("-printcrashinfo", ""));
534534
std::cout << crashInfo << std::endl;
535-
QMessageBox::critical(0, PACKAGE_NAME, QString::fromStdString(crashInfo));
535+
QMessageBox::critical(nullptr, PACKAGE_NAME, QString::fromStdString(crashInfo));
536536
return EXIT_SUCCESS;
537537
}
538538

@@ -630,7 +630,7 @@ int GuiMain(int argc, char* argv[])
630630
GUIUtil::LogQtInfo();
631631
// Load custom application fonts and setup font management
632632
if (!GUIUtil::loadFonts()) {
633-
QMessageBox::critical(0, PACKAGE_NAME,
633+
QMessageBox::critical(nullptr, PACKAGE_NAME,
634634
QObject::tr("Error: Failed to load application fonts."));
635635
return EXIT_FAILURE;
636636
}
@@ -643,7 +643,7 @@ int GuiMain(int argc, char* argv[])
643643
try {
644644
family = GUIUtil::fontFamilyFromString(strFamily);
645645
} catch (const std::exception& e) {
646-
QMessageBox::critical(0, PACKAGE_NAME,
646+
QMessageBox::critical(nullptr, PACKAGE_NAME,
647647
QObject::tr("Error: Specified font-family invalid. Valid values: %1.").arg("SystemDefault, Montserrat"));
648648
return EXIT_FAILURE;
649649
}
@@ -653,7 +653,7 @@ int GuiMain(int argc, char* argv[])
653653
if (gArgs.IsArgSet("-font-weight-normal")) {
654654
QFont::Weight weight;
655655
if (!GUIUtil::weightFromArg(gArgs.GetIntArg("-font-weight-normal", GUIUtil::weightToArg(GUIUtil::getFontWeightNormal())), weight)) {
656-
QMessageBox::critical(0, PACKAGE_NAME,
656+
QMessageBox::critical(nullptr, PACKAGE_NAME,
657657
QObject::tr("Error: Specified font-weight-normal invalid. Valid range %1 to %2.").arg(0).arg(8));
658658
return EXIT_FAILURE;
659659
}
@@ -663,7 +663,7 @@ int GuiMain(int argc, char* argv[])
663663
if (gArgs.IsArgSet("-font-weight-bold")) {
664664
QFont::Weight weight;
665665
if (!GUIUtil::weightFromArg(gArgs.GetIntArg("-font-weight-bold", GUIUtil::weightToArg(GUIUtil::getFontWeightBold())), weight)) {
666-
QMessageBox::critical(0, PACKAGE_NAME,
666+
QMessageBox::critical(nullptr, PACKAGE_NAME,
667667
QObject::tr("Error: Specified font-weight-bold invalid. Valid range %1 to %2.").arg(0).arg(8));
668668
return EXIT_FAILURE;
669669
}
@@ -674,7 +674,7 @@ int GuiMain(int argc, char* argv[])
674674
const int nScaleMin = -100, nScaleMax = 100;
675675
int nScale = gArgs.GetIntArg("-font-scale", GUIUtil::getFontScale());
676676
if (nScale < nScaleMin || nScale > nScaleMax) {
677-
QMessageBox::critical(0, PACKAGE_NAME,
677+
QMessageBox::critical(nullptr, PACKAGE_NAME,
678678
QObject::tr("Error: Specified font-scale invalid. Valid range %1 to %2.").arg(nScaleMin).arg(nScaleMax));
679679
return EXIT_FAILURE;
680680
}
@@ -688,7 +688,7 @@ int GuiMain(int argc, char* argv[])
688688
QString strFile;
689689

690690
if (!fs::is_directory(customDir)) {
691-
QMessageBox::critical(0, PACKAGE_NAME,
691+
QMessageBox::critical(nullptr, PACKAGE_NAME,
692692
QObject::tr("Error: Invalid -custom-css-dir path.") + "\n\n" + strCustomDir);
693693
return EXIT_FAILURE;
694694
}
@@ -708,7 +708,7 @@ int GuiMain(int argc, char* argv[])
708708
for (const auto& strMissingFile : vecRequiredFiles) {
709709
strMissingFiles += strMissingFile + "\n";
710710
}
711-
QMessageBox::critical(0, PACKAGE_NAME,
711+
QMessageBox::critical(nullptr, PACKAGE_NAME,
712712
QObject::tr("Error: %1 CSS file(s) missing in -custom-css-dir path.").arg(vecRequiredFiles.size()) + "\n\n" + strMissingFiles);
713713
return EXIT_FAILURE;
714714
}
@@ -717,7 +717,7 @@ int GuiMain(int argc, char* argv[])
717717
}
718718
// Validate -debug-ui
719719
if (gArgs.GetBoolArg("-debug-ui", false)) {
720-
QMessageBox::warning(0, PACKAGE_NAME,
720+
QMessageBox::warning(nullptr, PACKAGE_NAME,
721721
"Warning: UI debug mode (-debug-ui) enabled" + QString(gArgs.IsArgSet("-custom-css-dir") ? "." : " without a custom css directory set with -custom-css-dir."));
722722
}
723723

‎src/qt/intro.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ bool Intro::showIfNeeded(bool& did_show_intro, int64_t& prune_MiB)
229229
}
230230

231231
/* Let the user choose one */
232-
Intro intro(0, Params().AssumedBlockchainSize(), Params().AssumedChainStateSize());
232+
Intro intro(nullptr, Params().AssumedBlockchainSize(), Params().AssumedChainStateSize());
233233
GUIUtil::disableMacFocusRect(&intro);
234234
GUIUtil::loadStyleSheet(true);
235235
intro.setDataDirectory(dataDirDefaultCurrent);

‎src/randomenv.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,10 @@ void RandAddStaticEnv(CSHA512& hasher)
376376

377377
#if HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS
378378
// Network interfaces
379-
struct ifaddrs *ifad = NULL;
379+
struct ifaddrs *ifad = nullptr;
380380
getifaddrs(&ifad);
381381
struct ifaddrs *ifit = ifad;
382-
while (ifit != NULL) {
382+
while (ifit != nullptr) {
383383
hasher.Write((const unsigned char*)&ifit, sizeof(ifit));
384384
hasher.Write((const unsigned char*)ifit->ifa_name, strlen(ifit->ifa_name) + 1);
385385
hasher.Write((const unsigned char*)&ifit->ifa_flags, sizeof(ifit->ifa_flags));

‎src/support/allocators/secure.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct secure_allocator : public std::allocator<T> {
3838
typedef secure_allocator<_Other> other;
3939
};
4040

41-
T* allocate(std::size_t n, const void* hint = 0)
41+
T* allocate(std::size_t n, const void* hint = nullptr)
4242
{
4343
T* allocation = static_cast<T*>(LockedPoolManager::Instance().alloc(sizeof(T) * n));
4444
if (!allocation) {

0 commit comments

Comments
 (0)