summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-12 00:56:56 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-12 00:56:56 +0200
commit218f482fbfe96b2cddec8c05f6b8f174481d2e27 (patch)
treef54c33f277840e089793fff8547b05875546eac5 /source4/param
parentcb78d4593b5ac4eaa0cbead6f86027d040a9e88a (diff)
downloadsamba-218f482fbfe96b2cddec8c05f6b8f174481d2e27.tar.gz
samba-218f482fbfe96b2cddec8c05f6b8f174481d2e27.tar.bz2
samba-218f482fbfe96b2cddec8c05f6b8f174481d2e27.zip
Use common strlist implementation in Samba 3 and Samba 4.
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/generic.c2
-rw-r--r--source4/param/loadparm.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/param/generic.c b/source4/param/generic.c
index 80735d2a33..ed3045605d 100644
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -130,7 +130,7 @@ const char **param_get_string_list(struct param_context *ctx, const char *param,
if (separator == NULL)
separator = LIST_SEP;
- return str_list_make(ctx, p->value, separator);
+ return (const char **)str_list_make(ctx, p->value, separator);
}
int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section)
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index dbc4776bd8..e626cdf5dd 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -885,7 +885,7 @@ const char **lp_parm_string_list(TALLOC_CTX *mem_ctx,
const char *value = lp_get_parametric(lp_ctx, service, type, option);
if (value != NULL)
- return str_list_make(mem_ctx, value, separator);
+ return (const char **)str_list_make(mem_ctx, value, separator);
return NULL;
}
@@ -1299,7 +1299,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
strupper(*(char **)dest_ptr);
break;
case P_LIST:
- *(const char ***)dest_ptr = str_list_copy(pserviceDest,
+ *(const char ***)dest_ptr = (const char **)str_list_copy(pserviceDest,
*(const char ***)src_ptr);
break;
default:
@@ -1653,7 +1653,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
}
case P_LIST:
- *(const char ***)parm_ptr = str_list_make(mem_ctx,
+ *(const char ***)parm_ptr = (const char **)str_list_make(mem_ctx,
pszParmValue, NULL);
break;