LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues29 Pull requests1 Projects Releases32 Packages Wiki Activity

Replace remaining fprintf with tfm::format manually

Browse source
This commit is contained in:
MarcoFalke 2019-06-13 09:43:24 -04:00
parent fac03ec43a
commit fa8f195195
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
6 changed files with 9 additions and 11 deletions

2
src/bitcoin-cli.cpp
View file

@ -495,7 +495,7 @@ static int CommandLineRPC(int argc, char *argv[])
} }
if (strPrint != "") { 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; return nRet;
} }

2
src/bitcoin-tx.cpp
View file

@ -828,7 +828,7 @@ static int CommandLineRawTx(int argc, char* argv[])
} }
if (strPrint != "") { 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; return nRet;
} }

7
src/init.cpp
View file

@ -108,14 +108,13 @@ static fs::path GetPidFile()
NODISCARD static bool CreatePidFile() NODISCARD static bool CreatePidFile()
{ {
FILE* file = fsbridge::fopen(GetPidFile(), "w"); fsbridge::ofstream file{GetPidFile()};
if (file) { if (file) {
#ifdef WIN32 #ifdef WIN32
fprintf(file, "%d\n", GetCurrentProcessId()); tfm::format(file, "%d\n", GetCurrentProcessId());
#else #else
fprintf(file, "%d\n", getpid()); tfm::format(file, "%d\n", getpid());
#endif #endif
fclose(file);
return true; return true;
} else { } else {
return InitError(strprintf(_("Unable to create the PID file '%s': %s"), GetPidFile().string(), std::strerror(errno))); return InitError(strprintf(_("Unable to create the PID file '%s': %s"), GetPidFile().string(), std::strerror(errno)));

2
src/sync.cpp
View file

@ -57,7 +57,7 @@ struct CLockLocation {
std::string ToString() const std::string ToString() const
{ {
return tfm::format( return strprintf(
"%s %s:%s%s (in thread %s)", "%s %s:%s%s (in thread %s)",
mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name); mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name);
} }

1
test/lint/lint-format-strings.sh
View file

@ -13,6 +13,7 @@ export LC_ALL=C
FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=( FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=(
"FatalError,0" "FatalError,0"
"fprintf,1" "fprintf,1"
"tfm::format,1" # Assuming tfm::::format(std::ostream&, ...
"LogConnectFailure,1" "LogConnectFailure,1"
"LogPrint,1" "LogPrint,1"
"LogPrintf,0" "LogPrintf,0"

6
test/lint/lint-locale-dependence.sh
View file

@ -8,7 +8,6 @@ KNOWN_VIOLATIONS=(
"src/dbwrapper.cpp:.*vsnprintf" "src/dbwrapper.cpp:.*vsnprintf"
"src/httprpc.cpp.*trim" "src/httprpc.cpp.*trim"
"src/init.cpp:.*atoi" "src/init.cpp:.*atoi"
"src/init.cpp:.*fprintf"
"src/qt/rpcconsole.cpp:.*atoi" "src/qt/rpcconsole.cpp:.*atoi"
"src/rest.cpp:.*strtol" "src/rest.cpp:.*strtol"
"src/test/dbwrapper_tests.cpp:.*snprintf" "src/test/dbwrapper_tests.cpp:.*snprintf"
@ -85,7 +84,7 @@ LOCALE_DEPENDENT_FUNCTIONS=(
mbtowc # LC_CTYPE mbtowc # LC_CTYPE
mktime mktime
normalize # boost::locale::normalize normalize # boost::locale::normalize
# printf # LC_NUMERIC printf # LC_NUMERIC
putwc putwc
putwchar putwchar
scanf # LC_NUMERIC scanf # LC_NUMERIC
@ -189,8 +188,7 @@ GIT_GREP_OUTPUT=$(git grep -E "[^a-zA-Z0-9_\`'\"<>](${REGEXP_LOCALE_DEPENDENT_FU
EXIT_CODE=0 EXIT_CODE=0
for LOCALE_DEPENDENT_FUNCTION in "${LOCALE_DEPENDENT_FUNCTIONS[@]}"; do 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}" | \ 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 "\.(c|cpp|h):\s*(//|\*|/\*|\").*${LOCALE_DEPENDENT_FUNCTION}")
grep -vE 'fprintf\(.*(stdout|stderr)')
if [[ ${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES} != "" ]]; then if [[ ${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES} != "" ]]; then
MATCHES=$(grep -vE "${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES}" <<< "${MATCHES}") MATCHES=$(grep -vE "${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES}" <<< "${MATCHES}")
fi fi