mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Little code simplification for conf_filename

Browse Source
This commit is contained in:
louiz’
2020-09-23 23:55:50 +02:00
parent 0bb4f144fc
commit 5607c101d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+4 -4
View File
@@ -194,7 +194,7 @@ static int main_loop(std::string hostname, std::string password)
int main(int ac, char** av) int main(int ac, char** av)
{ {
std::string cli_conf_filename; std::string conf_filename{};
bool test_conf = false; bool test_conf = false;
if (ac > 1) if (ac > 1)
{ {
@@ -206,7 +206,7 @@ int main(int ac, char** av)
else if ((arg == "-t") || (arg == "--test-config")) else if ((arg == "-t") || (arg == "--test-config"))
test_conf = true; test_conf = true;
else if (i + 1 == ac) else if (i + 1 == ac)
cli_conf_filename = arg; conf_filename = arg;
else else
{ {
std::cerr << "Unknow command line option: " << arg std::cerr << "Unknow command line option: " << arg
@@ -215,8 +215,8 @@ int main(int ac, char** av)
} }
} }
} }
const std::string conf_filename = if (conf_filename.empty())
cli_conf_filename.empty() ? xdg_config_path("biboumi.cfg"): cli_conf_filename; conf_filename = xdg_config_path("biboumi.cfg");
std::cout << "Using configuration file: " << conf_filename << std::endl; std::cout << "Using configuration file: " << conf_filename << std::endl;
if (!Config::read_conf(conf_filename)) if (!Config::read_conf(conf_filename))