sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-09 09:57:48 +03:00
Code

r13710: fix compiler warnings

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2006-02-27 10:23:59 +00:00 committed by Gerald (Jerry) Carter
parent 291da7bac3
commit 6ee7de9bbf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ struct MprVar mprString(const char *s)
struct MprVar mprData(const uint8_t *p, size_t length)
{
struct MprVar var;
char *s = talloc_strndup(mprMemCtx(), p, length);
char *s = talloc_strndup(mprMemCtx(), (const char *)p, length);
if (s == NULL) {
return mprCreateUndefinedVar();
}
@ -229,7 +229,7 @@ struct MprVar mprLdbArray(struct ldb_context *ldb,
/*
turn a MprVar string variable into a const char *
*/
const char *mprToString(const struct MprVar *v)
const char *mprToString(struct MprVar *v)
{
if (v->trigger) {
mprReadProperty(v, 0);
@ -241,7 +241,7 @@ const char *mprToString(const struct MprVar *v)
/*
turn a MprVar integer variable into an int
*/
int mprToInt(const struct MprVar *v)
int mprToInt(struct MprVar *v)
{
if (v->trigger) {
mprReadProperty(v, 0);

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

@ -413,7 +413,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
struct cli_credentials *creds;
struct smb_composite_connect io;
struct smbcli_tree *tree;
const char *hostname, *sharename;
char *hostname, *sharename;
NTSTATUS result;
TALLOC_CTX *mem_ctx;

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

@ -179,7 +179,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
char *s;
ssize_t len;
len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX,
blob->data, blob->length, &s);
blob->data, blob->length, (void **)&s);
if (len == -1) {
ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
return -1;
@ -218,7 +218,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
case REG_MULTI_SZ: {
DATA_BLOB b = *blob;
char **list = NULL;
const char **list = NULL;
while (b.length > 0) {
char *s;
ssize_t len;
@ -227,7 +227,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
break;
}
len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX,
b.data, slen, &s);
b.data, slen, (void **)&s);
if (len == -1) {
ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
return -1;