diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-26 08:07:47 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-11-14 23:27:04 +0100 |
| commit | 3d4eb5c043eaaecf4bddc55e2fef12047cbb9981 (patch) | |
| tree | f05e6d8d7c1c8b5723c1dd75ef4b358fe3fd6a61 /lib/param | |
| parent | 3f0c7e87947b4f086dcf421dd4209f6afa7d7f4a (diff) | |
| download | samba-3d4eb5c043eaaecf4bddc55e2fef12047cbb9981.tar.gz samba-3d4eb5c043eaaecf4bddc55e2fef12047cbb9981.tar.xz samba-3d4eb5c043eaaecf4bddc55e2fef12047cbb9981.zip | |
lib/param: fix const warnings
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index d1e36dfcfb..b9a3e2081e 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -414,8 +414,10 @@ const char **lpcfg_parm_string_list(TALLOC_CTX *mem_ctx, { const char *value = lpcfg_get_parametric(lp_ctx, service, type, option); - if (value != NULL) - return (const char **)str_list_make(mem_ctx, value, separator); + if (value != NULL) { + char **l = str_list_make(mem_ctx, value, separator); + return discard_const_p(const char *, l); + } return NULL; } @@ -905,8 +907,8 @@ void copy_service(struct loadparm_service *pserviceDest, case P_CMDLIST: case P_LIST: TALLOC_FREE(*((char ***)dest_ptr)); - *(const char * const **)dest_ptr = (const char * const *)str_list_copy(pserviceDest, - *(const char * * const *)src_ptr); + *(char ***)dest_ptr = str_list_copy(pserviceDest, + *discard_const_p(const char **, src_ptr)); break; default: break; @@ -1287,8 +1289,8 @@ bool handle_netbios_aliases(struct loadparm_context *lp_ctx, struct loadparm_ser const char *pszParmValue, char **ptr) { TALLOC_FREE(lp_ctx->globals->netbios_aliases); - lp_ctx->globals->netbios_aliases = (const char **)str_list_make_v3(lp_ctx->globals->ctx, - pszParmValue, NULL); + lp_ctx->globals->netbios_aliases = str_list_make_v3_const(lp_ctx->globals->ctx, + pszParmValue, NULL); if (lp_ctx->s3_fns) { return lp_ctx->s3_fns->set_netbios_aliases(lp_ctx->globals->netbios_aliases); @@ -1502,9 +1504,8 @@ static bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr case P_CMDLIST: TALLOC_FREE(*(char ***)parm_ptr); - *(const char * const **)parm_ptr - = (const char * const *)str_list_make_v3(mem_ctx, - pszParmValue, NULL); + *(char ***)parm_ptr = str_list_make_v3(mem_ctx, + pszParmValue, NULL); break; case P_LIST: @@ -1537,7 +1538,7 @@ static bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr pszParmName, pszParmValue)); return false; } - *(const char * const **)parm_ptr = (const char * const *) new_list; + *(char ***)parm_ptr = new_list; break; } } @@ -2001,7 +2002,7 @@ static bool is_default(void *base_structure, int i) case P_CMDLIST: case P_LIST: return str_list_equal((const char * const *)parm_table[i].def.lvalue, - *(const char ***)def_ptr); + *(const char * const **)def_ptr); case P_STRING: case P_USTRING: return strequal(parm_table[i].def.svalue, |