From 86727730b8e4cfce2a4ecf2e787c8bf7f57af924 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Wed, 1 Jul 2020 08:07:18 +0200 Subject: Improve line/error reporting in server config parsing --- minecproxy/server.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'minecproxy/server.c') diff --git a/minecproxy/server.c b/minecproxy/server.c index b06286b..f1f0006 100644 --- a/minecproxy/server.c +++ b/minecproxy/server.c @@ -423,6 +423,7 @@ bool server_announce(struct server *server, int fd) bool server_commit(struct server *server) { + const char *error; struct saddr *saddr, *tmp; int r; @@ -445,8 +446,9 @@ bool server_commit(struct server *server) return false; } - if (!scfg_validate(&server->scfg)) { - error("%s: failed to validate config file", server->name); + if (!scfg_validate(&server->scfg, &error)) { + error("%s: failed to validate config file (%s)", + server->name, error); server_delete(server); return false; } @@ -468,7 +470,6 @@ bool server_commit(struct server *server) list_for_each_entry_safe(saddr, tmp, &server->scfg.locals, list) { struct server_local *local; - /* FIXME: error checks */ list_del(&saddr->list); local = local_new(server, saddr); if (!local) { -- cgit v1.2.3