diff options
| author | Martin Pool <mbp@samba.org> | 2001-11-23 04:53:56 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2001-11-23 04:53:56 +0000 |
| commit | 24d03aefe9c3055c979b6f5b178dd0e3df1225cc (patch) | |
| tree | db64cf92c21661ace89c0bb524d0dd7e2ca79962 | |
| parent | 3400a3a3ed098dbdc60f05798254e87c2ebbf426 (diff) | |
| download | samba-24d03aefe9c3055c979b6f5b178dd0e3df1225cc.tar.gz samba-24d03aefe9c3055c979b6f5b178dd0e3df1225cc.tar.bz2 samba-24d03aefe9c3055c979b6f5b178dd0e3df1225cc.zip | |
More better now.
(This used to be commit a875b3a6e7a9501a31fe15fb9b04394a95484e77)
| -rw-r--r-- | source3/lib/charcnv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 11ae2d9143..ab9554f848 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -95,7 +95,7 @@ size_t convert_string(charset_t from, charset_t to, { size_t i_len, o_len; size_t retval; - char* inbuf = (char*)src; + const char* inbuf = (char*)src; char* outbuf = (char*)dest; smb_iconv_t descriptor; @@ -118,7 +118,7 @@ size_t convert_string(charset_t from, charset_t to, i_len=srclen; o_len=destlen; - retval = smb_iconv(descriptor, &(const char *)inbuf, &i_len, &outbuf, &o_len); + retval = smb_iconv(descriptor, &inbuf, &i_len, &outbuf, &o_len); if(retval==-1) { char *reason="unknown error"; @@ -155,7 +155,7 @@ size_t convert_string_allocate(charset_t from, charset_t to, { size_t i_len, o_len, destlen; size_t retval; - char *inbuf = (char *)src; + const char *inbuf = (char *)src; char *outbuf, *ob; smb_iconv_t descriptor; @@ -190,7 +190,7 @@ convert: i_len = srclen; o_len = destlen; retval = smb_iconv(descriptor, - &(const char *) inbuf, &i_len, + &inbuf, &i_len, &outbuf, &o_len); if(retval == -1) { |