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

[tpot at samba.org]

Author: tpot
Date: 2005-07-04 01:31:34 +0000 (Mon, 04 Jul 2005)
New Revision: 8105

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

Log:
Add ejsrpc push/pull functions for uint16 and uint8.

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


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c	2005-07-04 01:23:38 UTC (rev 8104)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c	2005-07-04 01:31:34 UTC (rev 8105)
@@ -96,6 +96,50 @@
 
 
 /*
+  pull a uint8 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
+/*
+  pull a uint16 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
+/*
   pull a uint32 from a mpr variable to a C element
 */
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h	2005-07-04 01:23:38 UTC (rev 8104)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h	2005-07-04 01:31:34 UTC (rev 8105)
@@ -30,19 +30,18 @@
 
 NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
 NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
+
+NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t *r);
+NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t r);
+
+NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t *r);
+NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t r);
+
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t r);
-
-
-/* echo calls */
-
-#include "librpc/gen_ndr/ndr_echo.h"
-
-NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, struct echo_AddOne *r);
-NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, 
-			      const struct echo_AddOne *r);
-