r13710: fix compiler warnings

metze

diff --git a/source/scripting/ejs/mprutil.c b/source/scripting/ejs/mprutil.c
index 91683db6bdb9cd2528d32bd83be36e381227f37f..d8c44c2450de31d33aa108c6eac9ff1bcbfcc261 100644 (file)
--- a/source/scripting/ejs/mprutil.c
+++ b/source/scripting/ejs/mprutil.c
@@ -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);

diff --git a/source/scripting/ejs/smbcalls_cli.c b/source/scripting/ejs/smbcalls_cli.c
index e165222a984359b6701f2122044ed0dc012919c9..bc69c0653de457f42e33bff90b21e0d26b4fafb6 100644 (file)
--- a/source/scripting/ejs/smbcalls_cli.c
+++ b/source/scripting/ejs/smbcalls_cli.c
@@ -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;
 

diff --git a/source/scripting/ejs/smbcalls_data.c b/source/scripting/ejs/smbcalls_data.c
index 54e496ea575645c5e323f91f5ed5a36cba6b0c4c..a1686a71e176f0bc99fcb642724543556f7a31da 100644 (file)
--- a/source/scripting/ejs/smbcalls_data.c
+++ b/source/scripting/ejs/smbcalls_data.c
@@ -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;