diff options
author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:34:30 -0500 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:34:30 -0500 |
commit | e5a951325a6cac8567af3a66de6d2df577508ae4 (patch) | |
tree | 34da9fe59f3c2d7f8edb072144443a9704197831 /source3/modules/charset_macosxfs.c | |
parent | 57482469b32645250e92a7ffd003aeeb4a42235e (diff) | |
download | samba-e5a951325a6cac8567af3a66de6d2df577508ae4.tar.gz |
[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
(This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab)
Diffstat (limited to 'source3/modules/charset_macosxfs.c')
-rw-r--r-- | source3/modules/charset_macosxfs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/charset_macosxfs.c b/source3/modules/charset_macosxfs.c index bbfd4be3554..baf2a0071cb 100644 --- a/source3/modules/charset_macosxfs.c +++ b/source3/modules/charset_macosxfs.c @@ -201,9 +201,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 */ - const char **inbuf, size_t *inbytesleft, /* Script string */ - char **outbuf, size_t *outbytesleft) /* UTF-16-LE string */ + void *cd, /* Encoder handle */ + 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; @@ -323,9 +323,9 @@ static size_t macosxfs_encoding_pull( } static size_t macosxfs_encoding_push( - void *cd, /* Encoder handle */ - const char **inbuf, size_t *inbytesleft, /* UTF-16-LE string */ - char **outbuf, size_t *outbytesleft) /* Script string */ + void *cd, /* Encoder handle */ + 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; @@ -373,7 +373,7 @@ static size_t macosxfs_encoding_push( charsconverted = CFStringGetBytes( cfstring, CFRangeMake(0,cfsize), script_code, 0, False, - (uint8_t *)(*outbuf), *outbytesleft, &outsize); + *outbuf, *outbytesleft, &outsize); if (0 == charsconverted) { debug_out("String conversion: " |