summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-03 13:31:23 +0100
committerMichael Adam <obnox@samba.org>2008-01-03 14:17:48 +0100
commit46123918506112d02db42e19407057dd943b8720 (patch)
tree94e9dca90e20f39cd5683434345294124a0cc8ac
parent78acbddbd51a8201100a958447265ad9d7f46229 (diff)
downloadsamba-46123918506112d02db42e19407057dd943b8720.tar.gz
samba-46123918506112d02db42e19407057dd943b8720.tar.bz2
samba-46123918506112d02db42e19407057dd943b8720.zip
Rename libnet_smbconf_add_string_to_array() to libnet_conf_add_string_to_array().
This is the start of making nomenclature more consistent (functions in libnet_conf.c should be called libnet_conf_*, not libnet_smbconf_* ... Michael (This used to be commit 0dd3967bfd88a4d90941e80134c549f5ade63ad0)
-rw-r--r--source3/libnet/libnet_conf.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 01c4237f20..68726fa5d9 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -31,10 +31,10 @@
/**
* add a string to a talloced array of strings.
*/
-static WERROR libnet_smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
- char ***array,
- uint32_t count,
- const char *string)
+static WERROR libnet_conf_add_string_to_array(TALLOC_CTX *mem_ctx,
+ char ***array,
+ uint32_t count,
+ const char *string)
{
char **new_array = NULL;
@@ -346,19 +346,19 @@ static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
{
char *valstring;
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_valnames,
- count, valname);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_valnames,
+ count, valname);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
valstring = libnet_smbconf_format_registry_value(tmp_ctx,
valvalue);
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_valstrings,
- count,
- valstring);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_valstrings,
+ count,
+ valstring);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -540,9 +540,9 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
/* make sure "global" is always listed first */
if (libnet_smbconf_share_exists(GLOBAL_NAME)) {
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_share_names,
- 0, GLOBAL_NAME);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_share_names,
+ 0, GLOBAL_NAME);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -565,10 +565,10 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
continue;
}
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_share_names,
- added_count,
- subkey_name);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_share_names,
+ added_count,
+ subkey_name);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}