Replace remaining fprintf with tfm::format manually

MarcoFalke · MarcoFalke · commit fa8f19519594 · 2019-06-13T11:46:38.000-04:00
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
@@ -495,7 +495,7 @@ static int CommandLineRPC(int argc, char *argv[])
     }
 
     if (strPrint != "") {
-        fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
+        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());
     }
     return nRet;
 }
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -828,7 +828,7 @@ static int CommandLineRawTx(int argc, char* argv[])
     }
 
     if (strPrint != "") {
-        fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
+        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());
     }
     return nRet;
 }
diff --git a/src/init.cpp b/src/init.cpp
@@ -108,14 +108,13 @@ static fs::path GetPidFile()
 
 NODISCARD static bool CreatePidFile()
 {
-    FILE* file = fsbridge::fopen(GetPidFile(), "w");
+    fsbridge::ofstream file{GetPidFile()};
     if (file) {
 #ifdef WIN32
-        fprintf(file, "%d\n", GetCurrentProcessId());
+        tfm::format(file, "%d\n", GetCurrentProcessId());
 #else
-        fprintf(file, "%d\n", getpid());
+        tfm::format(file, "%d\n", getpid());
 #endif
-        fclose(file);
         return true;
     } else {
         return InitError(strprintf(_("Unable to create the PID file '%s': %s"), GetPidFile().string(), std::strerror(errno)));
diff --git a/src/sync.cpp b/src/sync.cpp
@@ -57,7 +57,7 @@ struct CLockLocation {
 
     std::string ToString() const
     {
-        return tfm::format(
+        return strprintf(
             "%s %s:%s%s (in thread %s)",
             mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name);
     }
diff --git a/test/lint/lint-format-strings.sh b/test/lint/lint-format-strings.sh
@@ -13,6 +13,7 @@ export LC_ALL=C
 FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=(
     "FatalError,0"
     "fprintf,1"
+    "tfm::format,1" # Assuming tfm::::format(std::ostream&, ...
     "LogConnectFailure,1"
     "LogPrint,1"
     "LogPrintf,0"
diff --git a/test/lint/lint-locale-dependence.sh b/test/lint/lint-locale-dependence.sh
@@ -8,7 +8,6 @@ KNOWN_VIOLATIONS=(
     "src/dbwrapper.cpp:.*vsnprintf"
     "src/httprpc.cpp.*trim"
     "src/init.cpp:.*atoi"
-    "src/init.cpp:.*fprintf"
     "src/qt/rpcconsole.cpp:.*atoi"
     "src/rest.cpp:.*strtol"
     "src/test/dbwrapper_tests.cpp:.*snprintf"
@@ -85,7 +84,7 @@ LOCALE_DEPENDENT_FUNCTIONS=(
     mbtowc       # LC_CTYPE
     mktime
     normalize    # boost::locale::normalize
-#   printf       # LC_NUMERIC
+    printf       # LC_NUMERIC
     putwc
     putwchar
     scanf        # LC_NUMERIC
@@ -189,8 +188,7 @@ GIT_GREP_OUTPUT=$(git grep -E "[^a-zA-Z0-9_\`'\"<>](${REGEXP_LOCALE_DEPENDENT_FU
 EXIT_CODE=0
 for LOCALE_DEPENDENT_FUNCTION in "${LOCALE_DEPENDENT_FUNCTIONS[@]}"; do
     MATCHES=$(grep -E "[^a-zA-Z0-9_\`'\"<>]${LOCALE_DEPENDENT_FUNCTION}(_r|_s)?[^a-zA-Z0-9_\`'\"<>]" <<< "${GIT_GREP_OUTPUT}" | \
-        grep -vE "\.(c|cpp|h):\s*(//|\*|/\*|\").*${LOCALE_DEPENDENT_FUNCTION}" | \
-        grep -vE 'fprintf\(.*(stdout|stderr)')
+        grep -vE "\.(c|cpp|h):\s*(//|\*|/\*|\").*${LOCALE_DEPENDENT_FUNCTION}")
     if [[ ${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES} != "" ]]; then
         MATCHES=$(grep -vE "${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES}" <<< "${MATCHES}")
     fi

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ static int CommandLineRPC(int argc, char *argv[])`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`if (strPrint != "") {`
`498`		`- fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());`
	`498`	`+ tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());`
`499`	`499`	`}`
`500`	`500`	`return nRet;`
`501`	`501`	`}`
Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ static int CommandLineRawTx(int argc, char* argv[])`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`if (strPrint != "") {`
`831`		`- fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());`
	`831`	`+ tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());`
`832`	`832`	`}`
`833`	`833`	`return nRet;`
`834`	`834`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ struct CLockLocation {`
`57`	`57`
`58`	`58`	`std::string ToString() const`
`59`	`59`	`{`
`60`		`- return tfm::format(`
	`60`	`+ return strprintf(`
`61`	`61`	`"%s %s:%s%s (in thread %s)",`
`62`	`62`	`mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name);`
`63`	`63`	`}`