From bd1ff1bc98012e312a493efc7cf32cc128e92050 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 3 Jun 2013 12:38:39 +0200 Subject: Use GPERROR when config parsing fails. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it more likely configuration parsing failures are detected. Signed-off-by: Günther Deschner --- proxy/src/gp_config.c | 6 +++--- proxy/src/gp_config_dinglibs.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c index ee96975..55eab64 100644 --- a/proxy/src/gp_config.c +++ b/proxy/src/gp_config.c @@ -420,7 +420,7 @@ static int gp_init_ini_context(const char *config_file, ctx = calloc(1, sizeof(struct gp_ini_context)); if (!ctx) { - return ENOENT; + return ENOMEM; } ret = gp_config_init(config_file, ctx); @@ -463,7 +463,7 @@ int load_config(struct gp_config *cfg) done: if (ret != 0) { - GPERROR("Error reading configuration %d: %s", ret, gp_strerror(ret)); + GPERROR("Error reading configuration %d: %s\n", ret, gp_strerror(ret)); } gp_config_close(ctx); safefree(ctx); @@ -513,7 +513,7 @@ struct gp_config *read_config(char *config_file, int opt_daemonize) ret = load_config(cfg); if (ret) { - GPDEBUG("Config file not found!\n"); + GPERROR("Failed to load configuration!\n"); } done: diff --git a/proxy/src/gp_config_dinglibs.c b/proxy/src/gp_config_dinglibs.c index 515b951..5916994 100644 --- a/proxy/src/gp_config_dinglibs.c +++ b/proxy/src/gp_config_dinglibs.c @@ -237,7 +237,7 @@ int gp_dinglibs_init(const char *config_file, 0, /* metadata_flags, FIXME */ &file_ctx); if (ret) { - GPDEBUG("Failed to open config file: %d (%s)\n", + GPERROR("Failed to open config file: %d (%s)\n", ret, gp_strerror(ret)); ini_config_destroy(ini_config); return ret; @@ -254,7 +254,7 @@ int gp_dinglibs_init(const char *config_file, if (ret) { char **errors = NULL; /* we had a parsing failure */ - GPDEBUG("Failed to parse config file: %d (%s)\n", + GPERROR("Failed to parse config file: %d (%s)\n", ret, gp_strerror(ret)); if (ini_config_error_count(ini_config)) { ini_config_get_errors(ini_config, &errors); -- cgit