From d4a26b9fbe3cafa7848c06bf74b4978a33726f41 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 2 Mar 2015 11:30:26 +0100 Subject: [PATCH] clear_cfg_file() -> clear_cfg() --- src/config.c | 4 ++-- src/main.c | 2 +- src/main.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index db1263b9..a12e5116 100644 --- a/src/config.c +++ b/src/config.c @@ -1085,7 +1085,7 @@ int cmd_parser (void *pool, int argc, char **argv, struct perm_cfg_st** config) } #define DEL(x) {talloc_free(x);x=NULL;} -void clear_cfg_file(struct perm_cfg_st* perm_config) +void clear_cfg(struct perm_cfg_st* perm_config) { unsigned i; @@ -1210,7 +1210,7 @@ void print_version(tOptions *opts, tOptDesc *desc) void reload_cfg_file(void *pool, struct perm_cfg_st* perm_config) { - clear_cfg_file(perm_config); + clear_cfg(perm_config); parse_cfg_file(pool, cfg_file, perm_config, 1); diff --git a/src/main.c b/src/main.c index 88433467..f8dddb89 100644 --- a/src/main.c +++ b/src/main.c @@ -858,7 +858,7 @@ unsigned total = 10; */ clear_lists(s); tls_global_deinit(s->creds); - clear_cfg_file(s->perm_config); + clear_cfg(s->perm_config); talloc_free(s->perm_config); talloc_free(s->main_pool); closelog(); diff --git a/src/main.h b/src/main.h index e83a485a..fad6c98d 100644 --- a/src/main.h +++ b/src/main.h @@ -42,7 +42,7 @@ extern sigset_t sig_default_set; int cmd_parser (void *pool, int argc, char **argv, struct perm_cfg_st** config); void reload_cfg_file(void *pool, struct perm_cfg_st* config); -void clear_cfg_file(struct perm_cfg_st* config); +void clear_cfg(struct perm_cfg_st* config); void write_pid_file(void); void remove_pid_file(void);