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

review: if/else cleanup

Browse source
This commit is contained in:
staviq 2023-08-29 22:13:03 +02:00
parent 3edee3fa93
commit 6fa208e157
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/log.h
View file

@ -335,14 +335,11 @@ inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStat
_disabled = false; _disabled = false;
} }
// Otherwise, process the arguments // Otherwise, process the arguments
else else if (log_current_filename != filename || log_current_target != target)
{
if (log_current_filename != filename || log_current_target != target)
{ {
_initialized = false; _initialized = false;
} }
} }
}
if (_initialized) if (_initialized)
{ {
@ -351,12 +348,10 @@ inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStat
// Log is disabled // Log is disabled
return nullptr; return nullptr;
} }
else // NOLINT
{
// with fallback in case something went wrong // with fallback in case something went wrong
return logfile ? logfile : stderr; return logfile ? logfile : stderr;
} }
}
else else
{ {
if (target != nullptr) if (target != nullptr)
@ -485,12 +480,14 @@ inline bool log_param_single_parse(const std::string & param)
log_test(); log_test();
return true; return true;
} }
else if ( param == "--log-disable") // NOLINT
if ( param == "--log-disable")
{ {
log_disable(); log_disable();
return true; return true;
} }
else if ( param == "--log-enable")
if ( param == "--log-enable")
{ {
log_enable(); log_enable();
return true; return true;
@ -503,11 +500,11 @@ inline bool log_param_pair_parse(bool check_but_dont_parse, const std::string &
{ {
if ( param == "--log-file") if ( param == "--log-file")
{ {
if (check_but_dont_parse) if (!check_but_dont_parse)
{ {
return true;
}
log_set_target(log_filename_generator(next.empty() ? "unnamed" : next, "log")); log_set_target(log_filename_generator(next.empty() ? "unnamed" : next, "log"));
}
return true; return true;
} }