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

[tridge at samba.org]

Author: tridge
Date: 2005-07-15 11:23:17 +0000 (Fri, 15 Jul 2005)
New Revision: 8489

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

Log:
neaten up the object handling

Modified:
   branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/mprutil.c	2005-07-15 11:10:38 UTC (rev 8488)
+++ branches/SAMBA_4_0/source/scripting/ejs/mprutil.c	2005-07-15 11:23:17 UTC (rev 8489)
@@ -385,3 +385,21 @@
 {
 	mprSetVar(obj, name, mprCreateStringCFunctionVar(fn, obj, MPR_VAR_SCRIPT_HANDLE));
 }
+
+/*
+  get a poiner in the current object
+*/
+void *mprGetThisPtr(int eid, const char *name)
+{
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	return mprGetPtr(this, name);
+}
+
+/*
+  set a pointer as a child of the local object
+*/
+void mprSetThisPtr(int eid, const char *name, void *ptr)
+{
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	mprSetPtrChild(this, name, ptr);
+}

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c	2005-07-15 11:10:38 UTC (rev 8488)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c	2005-07-15 11:23:17 UTC (rev 8489)
@@ -30,8 +30,7 @@
  */
 static struct ldb_context *ejs_ldb_db(int eid)
 {
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
-	struct ldb_context *ldb = mprGetPtr(this, "db");
+	struct ldb_context *ldb = mprGetThisPtr(eid, "db");
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "invalid ldb connection");
 	}
@@ -227,7 +226,6 @@
 {
 	struct ldb_context *ldb;
 	const char *dbfile;
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.connect invalid arguments");
@@ -241,7 +239,7 @@
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
 	}
 
-	mprSetPtrChild(this, "db", ldb);
+	mprSetThisPtr(eid, "db", ldb);
 	mpr_Return(eid, mprCreateBoolVar(ldb != NULL));
 	return 0;
 }