Skip to content

Commit fa5bc45

Browse files
author
MarcoFalke
committed
util: Use compile-time check for LogConnectFailure
1 parent fa7087b commit fa5bc45

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/netbase.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,8 @@ std::unique_ptr<Sock> CreateSockOS(int domain, int type, int protocol)
557557
std::function<std::unique_ptr<Sock>(int, int, int)> CreateSock = CreateSockOS;
558558

559559
template<typename... Args>
560-
static void LogConnectFailure(bool manual_connection, const char* fmt, const Args&... args) {
560+
static void LogConnectFailure(bool manual_connection, util::ConstevalFormatString<sizeof...(Args)> fmt, const Args&... args)
561+
{
561562
std::string error_message = tfm::format(fmt, args...);
562563
if (manual_connection) {
563564
LogPrintf("%s\n", error_message);

test/lint/lint-format-strings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS = [
1919
'tfm::format,1', # Assuming tfm::::format(std::ostream&, ...
20-
'LogConnectFailure,1',
2120
'LogError,0',
2221
'LogWarning,0',
2322
'LogInfo,0',

test/lint/run-lint-format-strings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import sys
1414

1515
FALSE_POSITIVES = [
16-
("src/netbase.cpp", "LogConnectFailure(bool manual_connection, const char* fmt, const Args&... args)"),
1716
("src/clientversion.cpp", "strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION)"),
1817
("src/test/translation_tests.cpp", "strprintf(format, arg)"),
1918
("src/validationinterface.cpp", "LogDebug(BCLog::VALIDATION, fmt \"\\n\", __VA_ARGS__)"),

0 commit comments

Comments
 (0)