config/ConfigFile: use std::exception on syntax error

This commit is contained in:
Max Kellermann
2015-12-16 11:12:30 +01:00
parent 6717325c3f
commit d256a0e98f
10 changed files with 127 additions and 87 deletions

View File

@@ -444,11 +444,11 @@ int mpd_main(int argc, char *argv[])
io_thread_init();
config_global_init();
try {
#ifdef ANDROID
(void)argc;
(void)argv;
(void)argc;
(void)argv;
{
const auto sdcard = Environment::getExternalStorageDirectory();
if (!sdcard.IsNull()) {
const auto config_path =
@@ -459,13 +459,16 @@ int mpd_main(int argc, char *argv[])
return EXIT_FAILURE;
}
}
}
#else
if (!parse_cmdline(argc, argv, &options, error)) {
LogError(error);
if (!parse_cmdline(argc, argv, &options, error)) {
LogError(error);
return EXIT_FAILURE;
}
#endif
} catch (const std::exception &e) {
LogError(e);
return EXIT_FAILURE;
}
#endif
#ifdef ENABLE_DAEMON
if (!glue_daemonize_init(&options, error)) {