From da464456e0790083663596e6139aff37a82e4d99 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 10 Jun 2015 14:58:10 +0200 Subject: [PATCH] config_parse_hooks() => config_parse_hooklist (as in config_parse_nodelist) --- server/include/cfg.h | 2 +- server/src/cfg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/include/cfg.h b/server/include/cfg.h index 19bc9b2b6..d0839bd35 100644 --- a/server/include/cfg.h +++ b/server/include/cfg.h @@ -79,7 +79,7 @@ int config_parse_nodelist(config_setting_t *cfg, struct list *nodes, struct list * hooks = [ "print", "fir" ] * hooks = "log" **/ -int config_parse_hooks(config_setting_t *cfg, struct list *hooks); +int config_parse_hooklist(config_setting_t *cfg, struct list *hooks); /** Parse a single node and add it to the global configuration. * diff --git a/server/src/cfg.c b/server/src/cfg.c index dde9fc37f..666e2bc65 100644 --- a/server/src/cfg.c +++ b/server/src/cfg.c @@ -123,7 +123,7 @@ int config_parse_path(config_setting_t *cfg, /* Optional settings */ struct config_setting_t *cfg_hook = config_setting_get_member(cfg, "hook"); if (cfg_hook) - config_parse_hooks(cfg_hook, &p->hooks); + config_parse_hooklist(cfg_hook, p->hooks); if (!config_setting_lookup_bool(cfg, "enabled", &enabled)) enabled = 1; @@ -209,7 +209,7 @@ int config_parse_nodelist(config_setting_t *cfg, struct list *nodes, struct list return 0; } -int config_parse_hooks(config_setting_t *cfg, struct list *hooks) { +int config_parse_hooklist(config_setting_t *cfg, struct list *hooks) { const char *str; hook_cb_t hook;