svn commit: samba r17715 - in branches/SAMBA_4_0/source/lib/charset: .

metze at samba.org metze at samba.org
Tue Aug 22 19:01:09 GMT 2006


Author: metze
Date: 2006-08-22 19:01:08 +0000 (Tue, 22 Aug 2006)
New Revision: 17715

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

Log:
make the cast explicit and remove compiler warnings

metze
Modified:
   branches/SAMBA_4_0/source/lib/charset/charcnv.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/charcnv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/charcnv.c	2006-08-22 18:51:46 UTC (rev 17714)
+++ branches/SAMBA_4_0/source/lib/charset/charcnv.c	2006-08-22 19:01:08 UTC (rev 17715)
@@ -630,11 +630,11 @@
 	/* this looks a little strange, but it is needed to cope
 	   with codepoints above 64k */
 	olen = 2;
-	outbuf = buf;
+	outbuf = (char *)buf;
 	smb_iconv(descriptor,  &str, &ilen, &outbuf, &olen);
 	if (olen == 2) {
 		olen = 4;
-		outbuf = buf;
+		outbuf = (char *)buf;
 		smb_iconv(descriptor,  &str, &ilen, &outbuf, &olen);
 		if (olen == 4) {
 			/* we didn't convert any bytes */
@@ -692,7 +692,7 @@
 	if (c < 0x10000) {
 		ilen = 2;
 		olen = 5;
-		inbuf = buf;
+		inbuf = (char *)buf;
 		SSVAL(buf, 0, c);
 		smb_iconv(descriptor, &inbuf, &ilen, &str, &olen);
 		if (ilen != 0) {
@@ -710,7 +710,7 @@
 
 	ilen = 4;
 	olen = 5;
-	inbuf = buf;
+	inbuf = (char *)buf;
 
 	smb_iconv(descriptor, &inbuf, &ilen, &str, &olen);
 	if (ilen != 0) {



More information about the samba-cvs mailing list