summaryrefslogtreecommitdiffstats
path: root/source4/scripting/ejs/smbcalls_data.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-02-27 10:23:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:52:07 -0500
commit760f5b4b39718e317e6a8f418e0ed156827ee0b1 (patch)
treec942954973f6ffec4d95e7c659c05995b33718c1 /source4/scripting/ejs/smbcalls_data.c
parentd5beaae0b82e7877c657c308b2969824cdc27fd1 (diff)
downloadsamba-760f5b4b39718e317e6a8f418e0ed156827ee0b1.tar.gz
samba-760f5b4b39718e317e6a8f418e0ed156827ee0b1.tar.xz
samba-760f5b4b39718e317e6a8f418e0ed156827ee0b1.zip
r13710: fix compiler warnings
metze (This used to be commit 6ee7de9bbf6ff55221fc8e3a6f467e69e564e2e1)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_data.c')
-rw-r--r--source4/scripting/ejs/smbcalls_data.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 54e496ea575..a1686a71e17 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -179,7 +179,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
char *s;
ssize_t len;
len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX,
- blob->data, blob->length, &s);
+ blob->data, blob->length, (void **)&s);
if (len == -1) {
ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
return -1;
@@ -218,7 +218,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
case REG_MULTI_SZ: {
DATA_BLOB b = *blob;
- char **list = NULL;
+ const char **list = NULL;
while (b.length > 0) {
char *s;
ssize_t len;
@@ -227,7 +227,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
break;
}
len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX,
- b.data, slen, &s);
+ b.data, slen, (void **)&s);
if (len == -1) {
ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
return -1;