summaryrefslogtreecommitdiff
path: root/source3/lib/smbconf
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-22 15:50:42 +0200
committerMichael Adam <obnox@samba.org>2008-04-22 16:11:37 +0200
commitb2425f88fafb7077534d043afa5cffe0307e968c (patch)
treeb99ed76b33fd59d8472b4d089f1a66b3c36ea3bf /source3/lib/smbconf
parent9188c8e38168b2a43137cbd496d36eee9b78ee2f (diff)
downloadsamba-b2425f88fafb7077534d043afa5cffe0307e968c.tar.gz
samba-b2425f88fafb7077534d043afa5cffe0307e968c.tar.bz2
samba-b2425f88fafb7077534d043afa5cffe0307e968c.zip
libsmbconf: rename smbconf_init_txt_simple() to smbconf_init_txt().
...for consistency. Michael (This used to be commit 3d1da73f66b8452693262e2d03f986eec438451d)
Diffstat (limited to 'source3/lib/smbconf')
-rw-r--r--source3/lib/smbconf/smbconf.h6
-rw-r--r--source3/lib/smbconf/smbconf_init.c4
-rw-r--r--source3/lib/smbconf/smbconf_txt.c6
-rw-r--r--source3/lib/smbconf/testsuite.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index 481c2b1693..5ea8f36d84 100644
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -37,9 +37,9 @@ WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
WERROR smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
const char *path);
-WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx **conf_ctx,
- const char *path);
+WERROR smbconf_init_txt(TALLOC_CTX *mem_ctx,
+ struct smbconf_ctx **conf_ctx,
+ const char *path);
/*
* the smbconf API functions
diff --git a/source3/lib/smbconf/smbconf_init.c b/source3/lib/smbconf/smbconf_init.c
index 2ad3a0807f..4efc440819 100644
--- a/source3/lib/smbconf/smbconf_init.c
+++ b/source3/lib/smbconf/smbconf_init.c
@@ -71,14 +71,14 @@ WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
if (strequal(backend, "registry") || strequal(backend, "reg")) {
werr = smbconf_init_reg(mem_ctx, conf_ctx, path);
} else if (strequal(backend, "file") || strequal(backend, "txt")) {
- werr = smbconf_init_txt_simple(mem_ctx, conf_ctx, path);
+ werr = smbconf_init_txt(mem_ctx, conf_ctx, path);
} else if (sep == NULL) {
/*
* If no separator was given in the source, and the string is
* not a know backend, assume file backend and use the source
* string as a path argument.
*/
- werr = smbconf_init_txt_simple(mem_ctx, conf_ctx, backend);
+ werr = smbconf_init_txt(mem_ctx, conf_ctx, backend);
} else {
/*
* Separator was specified but this is not a known backend.
diff --git a/source3/lib/smbconf/smbconf_txt.c b/source3/lib/smbconf/smbconf_txt.c
index d2dc24a117..ed39b7a9cc 100644
--- a/source3/lib/smbconf/smbconf_txt.c
+++ b/source3/lib/smbconf/smbconf_txt.c
@@ -624,9 +624,9 @@ static struct smbconf_ops smbconf_ops_txt = {
* initialize the smbconf text backend
* the only function that is exported from this module
*/
-WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx **conf_ctx,
- const char *path)
+WERROR smbconf_init_txt(TALLOC_CTX *mem_ctx,
+ struct smbconf_ctx **conf_ctx,
+ const char *path)
{
WERROR werr;
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 6f7ce10d9c..cffd239df6 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -183,7 +183,7 @@ static bool torture_smbconf_txt(void)
printf("test: text backend\n");
printf("test: init\n");
- werr = smbconf_init_txt_simple(mem_ctx, &conf_ctx, NULL);
+ werr = smbconf_init_txt(mem_ctx, &conf_ctx, NULL);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: init failed: %s\n", dos_errstr(werr));
ret = false;