IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798008 - Option '--log' cannot be specified more than once

Browse Source 
Wrapping the std::vector to hold the log flags is unneeded and actually harmful.
Just work on the vector directly. If user doesn't specify any '--log' options
the vector will just be empty.
This commit is contained in:
Geert Janssens 2020-11-13 10:58:14 +01:00
parent 79951e094f
commit e9a117b21b
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnucash/gnucash-core-app.cpp
View File

@ -346,7 +346,7 @@ load_user_config(void)
static void static void
gnc_log_init (const boost::optional <std::vector <std::string>> &log_flags, gnc_log_init (const std::vector <std::string> log_flags,
const boost::optional <std::string> &log_to_filename) const boost::optional <std::string> &log_to_filename)
{ {
if (log_to_filename && !log_to_filename->empty()) if (log_to_filename && !log_to_filename->empty())
@ -389,24 +389,21 @@ gnc_log_init (const boost::optional <std::vector <std::string>> &log_flags,
qof_log_parse_log_config (log_config_filename); qof_log_parse_log_config (log_config_filename);
g_free (log_config_filename); g_free (log_config_filename);
if (log_flags && !log_flags->empty()) for (auto log_flag : log_flags)
{ {
for (auto log_flag : *log_flags) if (log_flag.empty () ||
log_flag[0] == '=' ||
log_flag[log_flag.length () - 1] == '=')
{ {
if (log_flag.empty () || g_warning ("string [%s] not parseable", log_flag.c_str());
log_flag[0] == '=' || continue;
log_flag[log_flag.length () - 1] == '=')
{
g_warning ("string [%s] not parseable", log_flag.c_str());
continue;
}
std::vector<std::string> split_flag;
boost::split (split_flag, log_flag, [](char c){return c == '=';});
auto level = qof_log_level_from_string (split_flag[1].c_str());
qof_log_set_level (split_flag[0].c_str(), level);
} }
std::vector<std::string> split_flag;
boost::split (split_flag, log_flag, [](char c){return c == '=';});
auto level = qof_log_level_from_string (split_flag[1].c_str());
qof_log_set_level (split_flag[0].c_str(), level);
} }
} }

2
gnucash/gnucash-core-app.hpp
View File

@ -65,7 +65,7 @@ private:
bool m_debug = false; bool m_debug = false;
bool m_extra = false; bool m_extra = false;
boost::optional <std::string> m_gsettings_prefix; boost::optional <std::string> m_gsettings_prefix;
boost::optional <std::vector <std::string>> m_log_flags; std::vector <std::string> m_log_flags;
char *sys_locale = nullptr; char *sys_locale = nullptr;
}; };