diff options
Diffstat (limited to 'Userland/Utilities')
-rw-r--r-- | Userland/Utilities/ini.cpp | 2 | ||||
-rw-r--r-- | Userland/Utilities/keymap.cpp | 2 | ||||
-rw-r--r-- | Userland/Utilities/run-tests.cpp | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Userland/Utilities/ini.cpp b/Userland/Utilities/ini.cpp index 191b707e14..e1b7ae904e 100644 --- a/Userland/Utilities/ini.cpp +++ b/Userland/Utilities/ini.cpp @@ -31,7 +31,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 1; } - auto config = Core::ConfigFile::open(path, value_to_write ? Core::ConfigFile::AllowWriting::Yes : Core::ConfigFile::AllowWriting::No); + auto config = TRY(Core::ConfigFile::open(path, value_to_write ? Core::ConfigFile::AllowWriting::Yes : Core::ConfigFile::AllowWriting::No)); if (value_to_write) { config->write_entry(group, key, value_to_write); diff --git a/Userland/Utilities/keymap.cpp b/Userland/Utilities/keymap.cpp index 0818798109..8db477cbbf 100644 --- a/Userland/Utilities/keymap.cpp +++ b/Userland/Utilities/keymap.cpp @@ -53,7 +53,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 0; } - auto mapper_config(Core::ConfigFile::open("/etc/Keyboard.ini", Core::ConfigFile::AllowWriting::Yes)); + auto mapper_config = TRY(Core::ConfigFile::open("/etc/Keyboard.ini", Core::ConfigFile::AllowWriting::Yes)); int rc = 0; diff --git a/Userland/Utilities/run-tests.cpp b/Userland/Utilities/run-tests.cpp index 5941d2f26f..23f33a48b1 100644 --- a/Userland/Utilities/run-tests.cpp +++ b/Userland/Utilities/run-tests.cpp @@ -376,7 +376,13 @@ int main(int argc, char** argv) return 1; } - auto config = config_file.is_empty() ? Core::ConfigFile::open_for_app("Tests") : Core::ConfigFile::open(config_file); + auto config_or_error = config_file.is_empty() ? Core::ConfigFile::open_for_app("Tests") : Core::ConfigFile::open(config_file); + if (config_or_error.is_error()) { + warnln("Failed to open configuration file ({}): {}", config_file.is_empty() ? "User config for Tests" : config_file.characters(), config_or_error.error()); + return 1; + } + auto config = config_or_error.release_value(); + if (config->num_groups() == 0) warnln("Empty configuration file ({}) loaded!", config_file.is_empty() ? "User config for Tests" : config_file.characters()); |