diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-11 22:40:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:07 -0500 |
| commit | ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc (patch) | |
| tree | 520287c2e17509ba1d9a9895b986a1a59a945e80 /source4/scripting/ejs/mprutil.c | |
| parent | 3e5649f79f910c9cad96a362d679f34453e60fa9 (diff) | |
| download | samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.gz samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.xz samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.zip | |
r8333: merged with latest upstream ejs sources
(This used to be commit b0f9ddafe95d4e8d846bc72a39e94d22da271348)
Diffstat (limited to 'source4/scripting/ejs/mprutil.c')
| -rw-r--r-- | source4/scripting/ejs/mprutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c index 40ca050a96..4f799b2066 100644 --- a/source4/scripting/ejs/mprutil.c +++ b/source4/scripting/ejs/mprutil.c @@ -128,7 +128,7 @@ struct MprVar mprList(const char *name, const char **list) struct MprVar mprString(const char *s) { if (s == NULL) { - return mprCreatePtrVar(NULL, "NULL"); + return mprCreatePtrVar(NULL); } return mprCreateStringVar(s, 1); } @@ -289,7 +289,7 @@ struct MprVar mprWERROR(WERROR status) */ void mprSetPtr(struct MprVar *v, const char *propname, const void *p) { - mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL)); + mprSetVar(v, propname, mprCreatePtrVar(discard_const(p))); } /* @@ -297,7 +297,7 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p) */ void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p) { - mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL)); + mprSetVar(v, propname, mprCreatePtrVar(discard_const(p))); talloc_steal(mprGetProperty(v, propname, NULL), p); } |