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

[tridge at samba.org]

Author: tridge
Date: 2005-07-19 06:07:10 +0000 (Tue, 19 Jul 2005)
New Revision: 8581

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

Log:
fixed handling of 64 bit integers in rpc calls from ejs


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-19 05:35:19 UTC (rev 8580)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c	2005-07-19 06:07:10 UTC (rev 8581)
@@ -136,56 +136,50 @@
 			struct MprVar *v, const char *name, uint64_t *r)
 {
 	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
+	*r = mprVarToNumber(v);
 	return NT_STATUS_OK;
 }
 
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return mprSetVar(v, name, mprCreateNumberVar(*r));
 }
 
 NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }