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

natIconv.cc (read): Minor fixes. 

* gnu/gcj/convert/natIconv.cc (read): Minor fixes.
    (write): Ditto.

From-SVN: r31712
This commit is contained in:
Anthony Green 2000-01-31 08:56:09 +00:00 committed by Anthony Green
parent cbea2acb24
commit ab5cffc5e8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jan 31 00:43:15 2000 Anthony Green <green@redhat.com>
* gnu/gcj/convert/natIconv.cc (read): Minor fixes.
(write): Ditto.
2000-01-30 Tom Tromey <tromey@cygnus.com>
* include/config.h.in: Rebuilt.

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

@ -69,9 +69,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 *outbuf = (char *) &out[outpos];
size_t r = iconv ((iconv_t) handle,
&bytes[inpos], &inavail,
&out[outpos], &outavail);
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
inpos += old_in - inavail;
@ -118,7 +121,7 @@ gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer,
jint inpos, jint count)
{
#ifdef HAVE_ICONV
jint origpos = outpos;
jint origpos = inpos;
jchar *chars = elements (inbuffer);
jbyte *out = elements (buf);
@ -129,9 +132,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 *outbuf = (char *) &out[count];
size_t r = iconv ((iconv_t) handle,
&chars[inpos], &inavail,
&out[count], &outavail);
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
count += old_out - outavail;