diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 05:53:51 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:08 -0500 |
commit | 9f86e202865807ed898eff684d7cf3be7daae0fc (patch) | |
tree | 3f00468ba059e780c51b611ae7ebf5dd0d608648 /source4/scripting/ejs/smbcalls_options.c | |
parent | 1bb2b0603126188e639d7adb6309166c64b5e9df (diff) | |
download | samba-9f86e202865807ed898eff684d7cf3be7daae0fc.tar.gz samba-9f86e202865807ed898eff684d7cf3be7daae0fc.tar.bz2 samba-9f86e202865807ed898eff684d7cf3be7daae0fc.zip |
r8340: - added sys_gmtime()
- added sys_unlink()
- added sys_file_load() and sys_file_save()
- use mprString() instead of mprCreateStringVar() to cope with NULL strings
- removed smbcalls_irpc.c as its not needed any more
- allow ldbAdd() and ldbModify() to take multiple ldif records
- added a sprintf() function to ejs. Quite complex, but very useful!
(This used to be commit 625628a3f6e78349d2240ebcc79081f350672070)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_options.c')
-rw-r--r-- | source4/scripting/ejs/smbcalls_options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c index df871cbb96..005a3bcb9a 100644 --- a/source4/scripting/ejs/smbcalls_options.c +++ b/source4/scripting/ejs/smbcalls_options.c @@ -155,7 +155,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv) err = talloc_asprintf(tmp_ctx, "%s: %s", poptBadOption(pc, POPT_BADOPTION_NOALIAS), poptStrerror(opt)); - mprSetVar(options, "ERROR", mprCreateStringVar(err, 1)); + mprSetVar(options, "ERROR", mprString(err)); talloc_free(tmp_ctx); mpr_Return(eid, mprCreateBoolVar(0)); return 0; @@ -168,7 +168,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv) int v = strtol(arg, NULL, 0); mprSetVar(options, opt_names[opt], mprCreateIntegerVar(v)); } else { - mprSetVar(options, opt_names[opt], mprCreateStringVar(arg, 1)); + mprSetVar(options, opt_names[opt], mprString(arg)); } } |