sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

libsmbconf: rename smbconf_init_txt_simple() to smbconf_init_txt().

Browse Source 
...for consistency.

Michael
(This used to be commit 3d1da73f66)
This commit is contained in:
Michael Adam 2008-04-22 15:50:42 +02:00
parent 9188c8e381
commit b2425f88fa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/lib/smbconf/smbconf.h
View File

@ -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

4
source3/lib/smbconf/smbconf_init.c
View File

@ -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.

6
source3/lib/smbconf/smbconf_txt.c
View File

@ -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;

2
source3/lib/smbconf/testsuite.c
View File

@ -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;