diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 18:21:44 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 18:21:44 +0100 |
| commit | e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c (patch) | |
| tree | 5e7dd6c56c9886c4f8530faf92293d4a22684215 /source4/scripting/ejs/smbcalls_data.c | |
| parent | 3c20b3eebafe46127a7b69cca573c6a128f8de89 (diff) | |
| download | samba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.tar.gz samba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.tar.bz2 samba-e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c.zip | |
Introduce mprLpCtx() similar to mprMemCtx() for loadparm_context used by
all EJS code.
(This used to be commit 184988866fe8e740f58e3683eefcaa70f8b51d11)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_data.c')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c index 3ea41d46fb..19e1e173d6 100644 --- a/source4/scripting/ejs/smbcalls_data.c +++ b/source4/scripting/ejs/smbcalls_data.c @@ -177,7 +177,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv) case REG_EXPAND_SZ: { char *s; ssize_t len; - len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, + len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, blob->data, blob->length, (void **)&s); if (len == -1) { ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string"); @@ -225,7 +225,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv) if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) { break; } - len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, + len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, b.data, slen, (void **)&s); if (len == -1) { ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string"); |