conf: handle fatal errors with GError

Don't call g_error(), which will abort the process and dump core.

This patch does not affect all the config_get_X() functions.  These
need some more refactoring.
This commit is contained in:
Max Kellermann
2009-09-24 21:40:07 +02:00
parent f3739a73af
commit 06d5d4b03e
7 changed files with 136 additions and 58 deletions

View File

@@ -37,6 +37,8 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain,
int main(int argc, char **argv)
{
const char *path, *name, *value;
GError *error = NULL;
bool success;
int ret;
if (argc != 3) {
@@ -50,7 +52,12 @@ int main(int argc, char **argv)
g_log_set_default_handler(my_log_func, NULL);
config_global_init();
config_read_file(path);
success = config_read_file(path, &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
value = config_get_string(name, NULL);
if (value != NULL) {

View File

@@ -73,7 +73,7 @@ int main(int argc, char **argv)
}
param = config_new_param(NULL, -1);
config_add_block_param(param, "quality", "5.0", -1);
config_add_block_param(param, "quality", "5.0", -1, NULL);
encoder = encoder_init(plugin, param, &error);
if (encoder == NULL) {

View File

@@ -90,7 +90,12 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */
config_global_init();
config_read_file(argv[1]);
success = config_read_file(argv[1], &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
/* parse the audio format */

View File

@@ -122,7 +122,12 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */
config_global_init();
config_read_file(argv[1]);
success = config_read_file(argv[1], &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
/* initialize the audio output */