From 611b6bfa3b46fec656d68705fb8e88e31409f46a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 13 Apr 2008 16:26:14 +0200 Subject: libsmbconf: rename smbconf_init() to smbconf_init_internal(). smbconf_init should be the name of the dispatcher (to be written) Michael (This used to be commit 3fb95ab757650712716472ebaccb7119feb27596) --- source3/lib/smbconf/smbconf_private.h | 4 ++-- source3/lib/smbconf/smbconf_reg.c | 2 +- source3/lib/smbconf/smbconf_txt_simple.c | 2 +- source3/lib/smbconf/smbconf_util.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/smbconf/smbconf_private.h b/source3/lib/smbconf/smbconf_private.h index 5acba5a40ad..76f91f94d3e 100644 --- a/source3/lib/smbconf/smbconf_private.h +++ b/source3/lib/smbconf/smbconf_private.h @@ -68,8 +68,8 @@ struct smbconf_ctx { void *data; /* private data for use in backends */ }; -WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, - const char *path, struct smbconf_ops *ops); +WERROR smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, + const char *path, struct smbconf_ops *ops); WERROR smbconf_add_string_to_array(TALLOC_CTX *mem_ctx, char ***array, diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index ce38a20f3fc..2bdc11fa7ff 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -1055,5 +1055,5 @@ struct smbconf_ops smbconf_ops_reg = { WERROR smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, const char *path) { - return smbconf_init(mem_ctx, conf_ctx, path, &smbconf_ops_reg); + return smbconf_init_internal(mem_ctx, conf_ctx, path, &smbconf_ops_reg); } diff --git a/source3/lib/smbconf/smbconf_txt_simple.c b/source3/lib/smbconf/smbconf_txt_simple.c index 1bea6cb8b9c..7f70a5f34b4 100644 --- a/source3/lib/smbconf/smbconf_txt_simple.c +++ b/source3/lib/smbconf/smbconf_txt_simple.c @@ -607,7 +607,7 @@ WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx, { WERROR werr; - werr = smbconf_init(mem_ctx, conf_ctx, path, &smbconf_ops_txt); + werr = smbconf_init_internal(mem_ctx, conf_ctx, path, &smbconf_ops_txt); if (!W_ERROR_IS_OK(werr)) { return werr; } diff --git a/source3/lib/smbconf/smbconf_util.c b/source3/lib/smbconf/smbconf_util.c index ee79b6360fb..1a3a0ded44b 100644 --- a/source3/lib/smbconf/smbconf_util.c +++ b/source3/lib/smbconf/smbconf_util.c @@ -39,8 +39,8 @@ static int smbconf_destroy_ctx(struct smbconf_ctx *ctx) * After the work with the configuration is completed, smbconf_shutdown() * should be called. */ -WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, - const char *path, struct smbconf_ops *ops) +WERROR smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, + const char *path, struct smbconf_ops *ops) { WERROR werr = WERR_OK; struct smbconf_ctx *ctx; -- cgit