r8213: I've started to understand the LEVELS stuff in pidl much better now,

and have re-coded the push side of the ejs generator to use it
properly. It ends up being very neat and small, and should handle much
more complex structures (like arrays of pointers to unions etc).

Also added push side support for unions. This should get more of the
echo pipe working via ejs.
(This used to be commit 2e306be1d83f722c259c4a63233e77d8bb1d5a72)

1 files changed, 8 insertions, 25 deletions

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 75f748f146..965fd8d447 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -45,6 +45,13 @@ NTSTATUS ejs_push_rpc(int eid, const char *callname,
 	return ejs_push(ejs, v, ptr);
 }
 
+/*
+  set the switch var to be used by the next union switch
+*/
+void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var)
+{
+	ejs->switch_var = switch_var;
+}
 
 /*
   panic in the ejs wrapper code
@@ -274,34 +281,10 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs,
 
 
 /*
-  push an array of elements
-*/
-NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void *r, ejs_push_t ejs_push)
-{
-	int i;
-	char *data;
-
-	NDR_CHECK(ejs_push_struct_start(ejs, &v, name));
-
-	data = r;
-
-	for (i=0;i<length;i++) {
-		char *id = talloc_asprintf(ejs, "%u", i);
-		NT_STATUS_HAVE_NO_MEMORY(id);
-		NDR_CHECK(ejs_push(ejs, v, id, (i*elsize)+data));
-		talloc_free(id);
-	}
-	return mprSetVar(v, "length", mprCreateIntegerVar(i));
-}
-			
-
-/*
   pull a string
 */
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s)
+			 struct MprVar *v, const char *name, char **s)
 {
 	struct MprVar *var;
 	var = mprGetVar(v, name);