diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-08-22 19:01:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:30 -0500 |
| commit | 0e5f94131dfd3c6db78f6236a872a0669b3e60b7 (patch) | |
| tree | 045c6e0c8f4d16913e784558e305e44026a31dd7 /source4/lib/charset | |
| parent | 02515a76137e271d5a42c683bcda6c5a5db3a0db (diff) | |
| download | samba-0e5f94131dfd3c6db78f6236a872a0669b3e60b7.tar.gz samba-0e5f94131dfd3c6db78f6236a872a0669b3e60b7.tar.bz2 samba-0e5f94131dfd3c6db78f6236a872a0669b3e60b7.zip | |
r17715: make the cast explicit and remove compiler warnings
metze
(This used to be commit dab51c1f7fa3cdb9e1c3b094935362af6d6725c4)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/charcnv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index 0df77f4eff..f46f861fac 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -630,11 +630,11 @@ _PUBLIC_ codepoint_t next_codepoint(const char *str, size_t *size) /* 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 @@ _PUBLIC_ ssize_t push_codepoint(char *str, codepoint_t c) 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 @@ _PUBLIC_ ssize_t push_codepoint(char *str, codepoint_t c) ilen = 4; olen = 5; - inbuf = buf; + inbuf = (char *)buf; smb_iconv(descriptor, &inbuf, &ilen, &str, &olen); if (ilen != 0) { |