summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 22:40:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:07 -0500
commitba1ee57df43fe93c8b650478324ddd6cc1a3c7bc (patch)
tree520287c2e17509ba1d9a9895b986a1a59a945e80 /source4/scripting
parent3e5649f79f910c9cad96a362d679f34453e60fa9 (diff)
downloadsamba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.gz
samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.bz2
samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.zip
r8333: merged with latest upstream ejs sources
(This used to be commit b0f9ddafe95d4e8d846bc72a39e94d22da271348)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/ejs/ejsrpc.c2
-rw-r--r--source4/scripting/ejs/mprutil.c6
-rw-r--r--source4/scripting/ejs/smbcalls_cli.c11
-rw-r--r--source4/scripting/ejs/smbcalls_rpc.c2
4 files changed, 9 insertions, 12 deletions
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 57e0a8f690..fe61eac502 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -284,7 +284,7 @@ NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs,
NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
{
- return mprSetVar(v, name, mprCreatePtrVar(NULL, name));
+ return mprSetVar(v, name, mprCreatePtrVar(NULL));
}
BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
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);
}
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index c5611d555d..2433b33352 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -86,8 +86,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
/* Return a socket object */
- mpr_Return(eid, mprCreatePtrVar(transport,
- talloc_get_name(transport)));
+ mpr_Return(eid, mprCreatePtrVar(transport));
return 0;
}
@@ -214,8 +213,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
/* Return a session object */
- mpr_Return(eid, mprCreatePtrVar(session,
- talloc_get_name(session)));
+ mpr_Return(eid, mprCreatePtrVar(session));
result = 0;
@@ -297,8 +295,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
talloc_free(mem_ctx);
- mpr_Return(eid, mprCreatePtrVar(tree,
- talloc_get_name(tree)));
+ mpr_Return(eid, mprCreatePtrVar(tree));
return 0;
}
@@ -446,7 +443,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
return 0;
}
- mpr_Return(eid, mprCreatePtrVar(tree, talloc_get_name(tree)));
+ mpr_Return(eid, mprCreatePtrVar(tree));
return 0;
}
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 53f7bc2e55..6aef216ca4 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -412,7 +412,7 @@ void smb_setup_ejs_rpc_constants(int eid)
r->constants(eid);
}
- v = mprCreatePtrVar(NULL, "NULL");
+ v = mprCreatePtrVar(NULL);
mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
}