OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natIconv.cc (iconv_adapter): New function.

Browse Source 
* gnu/gcj/convert/natIconv.cc (iconv_adapter): New function.
	(read): Use it.
	(write): Likewise.

From-SVN: r34570
This commit is contained in:
Tom Tromey 2000-06-16 01:11:12 +00:00 committed by Tom Tromey
parent 8bad71361f
commit ff1c0096a1
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2000-06-15 Tom Tromey <tromey@cygnus.com>
* gnu/gcj/convert/natIconv.cc (iconv_adapter): New function.
(read): Use it.
(write): Likewise.
2000-06-15 Bryce McKinlay <bryce@albatross.co.nz>
Fix for PR java.lang/258:

26
libjava/gnu/gcj/convert/natIconv.cc
View File

@ -21,6 +21,16 @@ details. */
#ifdef HAVE_ICONV
#include <iconv.h>
template<typename T>
static inline size_t
iconv_adapter (size_t (*iconv_f) (iconv_t, T, size_t *, char **, size_t *),
iconv_t handle, char **inbuf, size_t *inavail,
char **outbuf, size_t *outavail)
{
return (*iconv_f) (handle, (T) inbuf, inavail, outbuf, outavail);
}
#endif
void
@ -69,12 +79,12 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
size_t outavail = count;
size_t old_out = outavail;
const char *inbuf = (const char *) &bytes[inpos];
char *inbuf = (char *) &bytes[inpos];
char *outbuf = (char *) &out[outpos];
size_t r = iconv ((iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
size_t r = iconv_adapter (iconv, (iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
inpos += old_in - inavail;
@ -132,12 +142,12 @@ gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer,
size_t outavail = buf->length - count;
size_t old_out = outavail;
const char *inbuf = (const char *) &chars[inpos];
char *inbuf = (char *) &chars[inpos];
char *outbuf = (char *) &out[count];
size_t r = iconv ((iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
size_t r = iconv_adapter (iconv, (iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
count += old_out - outavail;