sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-08 16:23:49 +03:00
Code Activity

r8333: merged with latest upstream ejs sources

Browse Source
This commit is contained in:
Andrew Tridgell
2005-07-11 22:40:32 +00:00
committed by Gerald (Jerry) Carter
parent 1d9632877c
commit b0f9ddafe9
13 changed files with 93 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/scripting/ejs/mprutil.c
View File

@@ -128,7 +128,7 @@ struct MprVar mprList(const char *name, const char **list)
struct MprVar mprString(const char *s)
{
if (s == NULL) {
return mprCreatePtrVar(NULL, "NULL");
return mprCreatePtrVar(NULL);
}
return mprCreateStringVar(s, 1);
}
@@ -289,7 +289,7 @@ struct MprVar mprWERROR(WERROR status)
*/
void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
{
mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
}
/*
@@ -297,7 +297,7 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
*/
void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
{
mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
talloc_steal(mprGetProperty(v, propname, NULL), p);
}