svn commit: samba r13710 - in branches/SAMBA_4_0/source/scripting/ejs: .

[metze at samba.org]

Author: metze
Date: 2006-02-27 10:23:59 +0000 (Mon, 27 Feb 2006)
New Revision: 13710

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13710

Log:
fix compiler warnings

metze
Modified:
   branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/mprutil.c	2006-02-27 10:14:11 UTC (rev 13709)
+++ branches/SAMBA_4_0/source/scripting/ejs/mprutil.c	2006-02-27 10:23:59 UTC (rev 13710)
@@ -143,7 +143,7 @@
 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 @@
 /*
   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 @@
 /*
   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);

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c	2006-02-27 10:14:11 UTC (rev 13709)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c	2006-02-27 10:23:59 UTC (rev 13710)
@@ -413,7 +413,7 @@
 	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;
 

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c	2006-02-27 10:14:11 UTC (rev 13709)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c	2006-02-27 10:23:59 UTC (rev 13710)
@@ -179,7 +179,7 @@
 		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 @@
 
 	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 @@
 				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;