svn commit: samba r8236 - in branches/SAMBA_4_0/source/scripting/ejs: .

tridge at samba.org tridge at samba.org
Fri Jul 8 09:37:54 GMT 2005


Author: tridge
Date: 2005-07-08 09:37:54 +0000 (Fri, 08 Jul 2005)
New Revision: 8236

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8236

Log:
fixed support for arrays of structures

Modified:
   branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c	2005-07-08 09:00:15 UTC (rev 8235)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c	2005-07-08 09:37:54 UTC (rev 8236)
@@ -126,7 +126,7 @@
 */
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	*v = mprGetProperty(*v, name, NULL);
+	*v = mprGetVar(*v, name);
 	if (*v == NULL) {
 		DEBUG(1,("ejs_pull_struct_start: missing structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
@@ -140,10 +140,10 @@
 */
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	struct MprVar s = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
-	*v = mprSetProperty(*v, name, &s);
+	NDR_CHECK(mprSetVar(*v, name, mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE)));
+	*v = mprGetVar(*v, name);
 	if (*v == NULL) {
-		DEBUG(1,("ejs_push_struct_start: unable to set structure '%s'\n", name));
+		DEBUG(1,("ejs_push_struct_start: missing structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	return NT_STATUS_OK;



More information about the samba-cvs mailing list