vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

review: simplify ifs and str comparisons

Browse source
This commit is contained in:
staviq 2023-08-29 17:44:54 +02:00
parent 3a10f5aa34
commit ba5590f44b
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
common/log.h
View file

@ -337,12 +337,7 @@ inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStat
// Otherwise, process the arguments // Otherwise, process the arguments
else else
{ {
if (log_current_filename != filename) if (log_current_filename != filename || log_current_target != target)
{
_initialized = false;
}
if (log_current_target != target)
{ {
_initialized = false; _initialized = false;
} }
@ -384,14 +379,9 @@ inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStat
{ {
fclose(logfile); fclose(logfile);
} }
logfile = nullptr;
logfile = fopen(filename.c_str(), "w");
}
else
{
logfile = fopen(filename.c_str(), "w");
} }
logfile = fopen(filename.c_str(), "w");
} }
if (!logfile) if (!logfile)
@ -490,17 +480,17 @@ inline void log_test()
inline bool log_param_single_parse(const std::string & param) inline bool log_param_single_parse(const std::string & param)
{ {
if (std::string("--log-test") == param) if ( param == "--log-test")
{ {
log_test(); log_test();
return true; return true;
} }
else if (std::string("--log-disable") == param) // NOLINT else if ( param == "--log-disable") // NOLINT
{ {
log_disable(); log_disable();
return true; return true;
} }
else if (std::string("--log-enable") == param) else if ( param == "--log-enable")
{ {
log_enable(); log_enable();
return true; return true;
@ -511,7 +501,7 @@ inline bool log_param_single_parse(const std::string & param)
inline bool log_param_pair_parse(bool check_but_dont_parse, const std::string & param, const std::string & next = std::string()) inline bool log_param_pair_parse(bool check_but_dont_parse, const std::string & param, const std::string & next = std::string())
{ {
if (std::string("--log-file") == param) if ( param == "--log-file")
{ {
if (check_but_dont_parse) if (check_but_dont_parse)
{ {