summaryrefslogtreecommitdiff
path: root/source4/lib/charset/iconv.c
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/charset/iconv.c')
-rw-r--r--source4/lib/charset/iconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c
index 8510f70d96..1c571f8961 100644
--- a/source4/lib/charset/iconv.c
+++ b/source4/lib/charset/iconv.c
@@ -75,7 +75,7 @@ static struct charset_functions *charsets = NULL;
bool charset_register_backend(const void *_funcs)
{
- struct charset_functions *funcs = memdup(_funcs,sizeof(struct charset_functions));
+ struct charset_functions *funcs = (struct charset_functions *)memdup(_funcs,sizeof(struct charset_functions));
struct charset_functions *c;
/* Check whether we already have this charset... */
@@ -199,7 +199,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
}
#ifdef HAVE_NATIVE_ICONV
- if ((!from || !to) && !lp_parm_bool(-1, "iconv", "native", true)) {
+ if ((!from || !to) && !lp_parm_bool(NULL, "iconv", "native", true)) {
goto failed;
}
if (!from) {