svn commit: samba r8320 - in
branches/SAMBA_4_0/source/scripting/ejs: .
tridge at samba.org
tridge at samba.org
Mon Jul 11 10:18:26 GMT 2005
Author: tridge
Date: 2005-07-11 10:18:26 +0000 (Mon, 11 Jul 2005)
New Revision: 8320
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8320
Log:
make sure all our returned objects are full objects, which means they
have the toString() and valueOf() default attributes
this allows all our returned objects to be used in logical expressions
Modified:
branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_nss.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -58,7 +58,7 @@
*/
NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
{
- NDR_CHECK(mprSetVar(*v, name, mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE)));
+ NDR_CHECK(mprSetVar(*v, name, mprObject(name)));
return mprGetVar(v, name);
}
Modified: branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -25,6 +25,14 @@
#include "lib/ldb/include/ldb.h"
/*
+ return a default mpr object
+*/
+struct MprVar mprObject(const char *name)
+{
+ return ejsCreateObj(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+}
+
+/*
find a mpr component, allowing for sub objects, using the '.' convention
*/
NTSTATUS mprGetVar(struct MprVar **v, const char *name)
@@ -75,7 +83,7 @@
}
v2 = mprGetProperty(v, objname, NULL);
if (v2 == NULL) {
- mprSetVar(v, objname, mprCreateObjVar(objname, MPR_DEFAULT_HASH_SIZE));
+ mprSetVar(v, objname, mprObject(objname));
v2 = mprGetProperty(v, objname, NULL);
}
status = mprSetVar(v2, p+1, val);
@@ -104,7 +112,7 @@
struct MprVar var;
int i;
- var = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
+ var = mprObject(name);
for (i=0;list && list[i];i++) {
mprAddArray(&var, i, mprCreateStringVar(list[i], 1));
}
@@ -119,7 +127,6 @@
*/
struct MprVar mprString(const char *s)
{
- struct MprVar var;
if (s == NULL) {
return mprCreatePtrVar(NULL, "NULL");
}
@@ -154,7 +161,7 @@
const char *multivalued[] = { "objectClass", "memberOf", "privilege",
"member", NULL };
- var = mprCreateObjVar(msg->dn, MPR_DEFAULT_HASH_SIZE);
+ var = mprObject(msg->dn);
for (i=0;i<msg->num_elements;i++) {
struct ldb_message_element *el = &msg->elements[i];
@@ -164,7 +171,7 @@
val = mprData(el->values[0].data, el->values[0].length);
} else {
int j;
- val = mprCreateObjVar(el->name, MPR_DEFAULT_HASH_SIZE);
+ val = mprObject(el->name);
for (j=0;j<el->num_values;j++) {
mprAddArray(&val, j,
mprData(el->values[j].data,
@@ -191,7 +198,7 @@
struct MprVar res;
int i;
- res = mprCreateObjVar(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+ res = mprObject(name);
for (i=0;i<count;i++) {
mprAddArray(&res, i, mprLdbMessage(msg[i]));
}
@@ -249,7 +256,7 @@
{
struct MprVar res;
- res = mprCreateObjVar("ntstatus", MPR_DEFAULT_HASH_SIZE);
+ res = mprObject("ntstatus");
mprSetVar(&res, "errstr", mprCreateStringVar(nt_errstr(status), 1));
mprSetVar(&res, "v", mprCreateIntegerVar(NT_STATUS_V(status)));
@@ -266,7 +273,7 @@
{
struct MprVar res;
- res = mprCreateObjVar("werror", MPR_DEFAULT_HASH_SIZE);
+ res = mprObject("werror");
mprSetVar(&res, "errstr", mprCreateStringVar(win_errstr(status), 1));
mprSetVar(&res, "v", mprCreateIntegerVar(W_ERROR_V(status)));
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -70,7 +70,7 @@
static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv)
{
int i, count = iface_count();
- struct MprVar ret = mprCreateObjVar("interfaces", MPR_DEFAULT_HASH_SIZE);
+ struct MprVar ret = mprObject("interfaces");
for (i=0;i<count;i++) {
mprAddArray(&ret, i, mprString(iface_n_ip(i)));
}
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -101,7 +101,7 @@
remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
tmp_ctx = talloc_new(mprMemCtx());
- auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
+ auth = mprObject("auth");
if (domain && strcmp("System User", domain) == 0) {
@@ -126,7 +126,7 @@
return -1;
}
- list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+ list = mprObject("list");
mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
mpr_Return(eid, list);
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -674,7 +674,7 @@
attribute = mprVarToInteger(argv[2]);
- result = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+ result = mprObject("list");
smbcli_list(tree, mask, attribute, ejs_list_helper, &result);
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_nss.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_nss.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_nss.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -35,7 +35,7 @@
if (pwd == NULL) {
return mprCreateUndefinedVar();
}
- ret = mprCreateObjVar("passwd", MPR_DEFAULT_HASH_SIZE);
+ ret = mprObject("passwd");
mprSetVar(&ret, "pw_name", mprString(pwd->pw_name));
mprSetVar(&ret, "pw_passwd", mprString(pwd->pw_passwd));
@@ -56,7 +56,7 @@
if (grp == NULL) {
return mprCreateUndefinedVar();
}
- ret = mprCreateObjVar("group", MPR_DEFAULT_HASH_SIZE);
+ ret = mprObject("group");
mprSetVar(&ret, "gr_name", mprString(grp->gr_name));
mprSetVar(&ret, "gr_passwd", mprString(grp->gr_passwd));
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2005-07-11 09:20:47 UTC (rev 8319)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2005-07-11 10:18:26 UTC (rev 8320)
@@ -227,7 +227,7 @@
talloc_steal(reqs, reqs[i]);
}
- mprSetVar(io, "results", mprCreateObjVar("results", MPR_DEFAULT_HASH_SIZE));
+ mprSetVar(io, "results", mprObject("results"));
results = mprGetProperty(io, "results", NULL);
/* and receive the results, placing them in io.results[i] */
More information about the samba-cvs
mailing list