summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-01-03 06:55:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:53 -0500
commitbf4e44d6468de2a4a4f56bc0d81580c1d0aabccf (patch)
tree69194282570ba62574f87e4bcd23762559fcee6f
parent94a750082315d9722365ce09a4ef76da2f50b384 (diff)
downloadsamba-bf4e44d6468de2a4a4f56bc0d81580c1d0aabccf.tar.gz
samba-bf4e44d6468de2a4a4f56bc0d81580c1d0aabccf.tar.bz2
samba-bf4e44d6468de2a4a4f56bc0d81580c1d0aabccf.zip
r20500: Fix compiler warnings.
(This used to be commit 9a790ee1fcfdaab1c9ee0884694832bd81f512bb)
-rw-r--r--source3/modules/charset_macosxfs.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/charset_macosxfs.c b/source3/modules/charset_macosxfs.c
index 3e5e2ff8bd..ab6db9319e 100644
--- a/source3/modules/charset_macosxfs.c
+++ b/source3/modules/charset_macosxfs.c
@@ -202,9 +202,9 @@ static void hexdump( const char * label, const char * s, size_t len )
* 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_pull(
}
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 @@ static size_t macosxfs_encoding_push(
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: "