From ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 22:40:32 +0000
Subject: r8333: merged with latest upstream ejs sources (This used to be
 commit b0f9ddafe95d4e8d846bc72a39e94d22da271348)

---
 source4/scripting/ejs/ejsrpc.c       |  2 +-
 source4/scripting/ejs/mprutil.c      |  6 +++---
 source4/scripting/ejs/smbcalls_cli.c | 11 ++++-------
 source4/scripting/ejs/smbcalls_rpc.c |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'source4/scripting/ejs')

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);
 }
 
-- 
cgit