libsmbconf: rename smbconf_init_txt_simple() to smbconf_init_txt().

...for consistency.

Michael

diff --git a/source/lib/smbconf/smbconf.h b/source/lib/smbconf/smbconf.h
index 481c2b169396aadd4730b09932fd8ebed130c11c..5ea8f36d84ca51569acac49e477e3f514783d87c 100644 (file)
--- a/source/lib/smbconf/smbconf.h
+++ b/source/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/source/lib/smbconf/smbconf_init.c b/source/lib/smbconf/smbconf_init.c
index 2ad3a0807fa74d781117418c1c32ff88f4c196fc..4efc440819ece8809450c93d562e41a82e7f10d7 100644 (file)
--- a/source/lib/smbconf/smbconf_init.c
+++ b/source/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/source/lib/smbconf/smbconf_txt.c b/source/lib/smbconf/smbconf_txt.c
index d2dc24a117bde412891b994f02493d428d446026..ed39b7a9ccfb440526b590c92166037c2360f741 100644 (file)
--- a/source/lib/smbconf/smbconf_txt.c
+++ b/source/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/source/lib/smbconf/testsuite.c b/source/lib/smbconf/testsuite.c
index 6f7ce10d9cfee8fc07a76561bdb2074b3f2d99f4..cffd239df6af0fbac17817add9ea0f08dde56427 100644 (file)
--- a/source/lib/smbconf/testsuite.c
+++ b/source/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;