sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-26 23:33:15 +03:00
Code Activity

r25035: Fix some more warnings, use service pointer rather than service number in more places.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-09-08 16:46:30 +00:00
committed by Gerald (Jerry) Carter
parent ec1c68e3a6
commit df9cebcb97
114 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/scripting/ejs/ejsrpc.c
View File

@@ -417,7 +417,7 @@ NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
const uint8_t *r, uint32_t length)
{
DATA_BLOB blob;
blob.data = discard_const(r);
blob.data = (uint8_t *)discard_const(r);
blob.length = length;
mprSetVar(v, name, mprDataBlob(blob));
return NT_STATUS_OK;

15
source/scripting/ejs/smbcalls_config.c
View File

@@ -37,7 +37,7 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
if (argc != 0) return -1;
for (i=0;i<lp_numservices();i++) {
list = str_list_add(list, lp_servicename(i));
list = str_list_add(list, lp_servicename(lp_servicebynum(i)));
}
talloc_steal(mprMemCtx(), list);
mpr_Return(eid, mprList("services", list));
@@ -87,9 +87,10 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
if (argc < 1) return -1;
if (argc == 2) {
struct service *service;
/* its a share parameter */
int snum = lp_servicenumber(argv[0]);
if (snum == -1) {
service = lp_service(argv[0]);
if (service == NULL) {
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
}
@@ -104,7 +105,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
}
value = lp_get_parametric(snum, type, option);
value = lp_get_parametric(service, type, option);
if (value == NULL) {
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
@@ -118,7 +119,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
}
parm_ptr = lp_parm_ptr(snum, parm);
parm_ptr = lp_parm_ptr(service, parm);
} else if (strchr(argv[0], ':')) {
/* its a global parametric option */
const char *type = talloc_strndup(mprMemCtx(),
@@ -129,7 +130,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
}
value = lp_get_parametric(-1, type, option);
value = lp_get_parametric(NULL, type, option);
if (value == NULL) {
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
@@ -143,7 +144,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
mpr_Return(eid, mprCreateUndefinedVar());
return 0;
}
parm_ptr = lp_parm_ptr(-1, parm);
parm_ptr = lp_parm_ptr(NULL, parm);
}
if (parm == NULL || parm_ptr == NULL) {