svn commit: samba r20500 - in branches/SAMBA_3_0/source/modules: .

jpeach at samba.org jpeach at samba.org
Wed Jan 3 06:55:13 GMT 2007


Author: jpeach
Date: 2007-01-03 06:55:12 +0000 (Wed, 03 Jan 2007)
New Revision: 20500

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

Log:
Fix compiler warnings.

Modified:
   branches/SAMBA_3_0/source/modules/charset_macosxfs.c


Changeset:
Modified: branches/SAMBA_3_0/source/modules/charset_macosxfs.c
===================================================================
--- branches/SAMBA_3_0/source/modules/charset_macosxfs.c	2007-01-03 06:53:13 UTC (rev 20499)
+++ branches/SAMBA_3_0/source/modules/charset_macosxfs.c	2007-01-03 06:55:12 UTC (rev 20500)
@@ -202,9 +202,9 @@
  * perfect fits.
  */
 static size_t macosxfs_encoding_pull(
-	void *cd,				/* Encoder handle */
-	char **inbuf, size_t *inbytesleft,	/* Script string */
-	char **outbuf, size_t *outbytesleft)	/* UTF-16-LE string */
+	void *cd,				    /* Encoder handle */
+	const char **inbuf, size_t *inbytesleft,    /* Script string */
+	char **outbuf, size_t *outbytesleft)	    /* UTF-16-LE string */
 {
 	static const int script_code = kCFStringEncodingUTF8;
 	static CFMutableStringRef cfstring = NULL;
@@ -324,9 +324,9 @@
 }
 
 static size_t macosxfs_encoding_push(
-	void *cd,				/* Encoder handle */
-	char **inbuf, size_t *inbytesleft,	/* UTF-16-LE string */
-	char **outbuf, size_t *outbytesleft)	/* Script string */
+	void *cd,				    /* Encoder handle */
+	const char **inbuf, size_t *inbytesleft,    /* UTF-16-LE string */
+	char **outbuf, size_t *outbytesleft)	    /* Script string */
 {
 	static const int script_code = kCFStringEncodingUTF8;
 	static CFMutableStringRef cfstring = NULL;
@@ -374,7 +374,7 @@
 	charsconverted = CFStringGetBytes(
 		cfstring, CFRangeMake(0,cfsize),
 		script_code, 0, False,
-		*outbuf, *outbytesleft, &outsize);
+		(uint8_t *)(*outbuf), *outbytesleft, &outsize);
 
 	if (0 == charsconverted) {
 		debug_out("String conversion: "



More information about the samba-cvs mailing list