[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / modules / charset_macosxfs.c

diff --git a/source/modules/charset_macosxfs.c b/source/modules/charset_macosxfs.c
index 51c3fbe4c9deb251464fb943b93eeb7d8573d76c..baf2a0071cbc64fcf50ef4ad2330bddc61b23898 100644 (file)
--- a/source/modules/charset_macosxfs.c
+++ b/source/modules/charset_macosxfs.c
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -202,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;
@@ -324,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;
@@ -374,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: "