r8635: make object inheritance with the builtin objects easy by allowing

callers to optionally supply an existing object to add the properties
to. So you can do:

 var rpc = samr_init();
 lsa_init(rpc);

and you end up with 'rpc' having both the samr and lsa functions and
constants available.
(This used to be commit 6a1ed328e27769bd52899fc2437a43fc17104eff)

1 files changed, 12 insertions, 13 deletions

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index b1fb854dfb..61b89843dc 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -193,19 +193,18 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar obj = mprObject("sys");
-
-	mprSetCFunction(&obj, "interfaces", ejs_sys_interfaces);
-	mprSetCFunction(&obj, "hostname", ejs_sys_hostname);
-	mprSetCFunction(&obj, "nttime", ejs_sys_nttime);
-	mprSetCFunction(&obj, "gmtime", ejs_sys_gmtime);
-	mprSetCFunction(&obj, "ldaptime", ejs_sys_ldaptime);
-	mprSetCFunction(&obj, "httptime", ejs_sys_httptime);
-	mprSetStringCFunction(&obj, "unlink", ejs_sys_unlink);
-	mprSetStringCFunction(&obj, "file_load", ejs_sys_file_load);
-	mprSetStringCFunction(&obj, "file_save", ejs_sys_file_save);
-
-	mpr_Return(eid, obj);
+	struct MprVar *obj = mprInitObject(eid, "sys", argc, argv);
+
+	mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
+	mprSetCFunction(obj, "hostname", ejs_sys_hostname);
+	mprSetCFunction(obj, "nttime", ejs_sys_nttime);
+	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
+	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
+	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
+	mprSetStringCFunction(obj, "unlink", ejs_sys_unlink);
+	mprSetStringCFunction(obj, "file_load", ejs_sys_file_load);
+	mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
+
 	return 0;
 }