summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2003-01-18 22:49:28 +0000
committerMark Wielaard <mark@klomp.org>2003-01-18 22:49:28 +0000
commit6f6f0e310b6bd74187ae8934304c56d8b51f45c0 (patch)
treea0ce1424eb769cad9a98c5497f93a8bf9665677e
parentb31ec49ee0597304218f6d43aa7535bd689305ce (diff)
downloadclasspath-6f6f0e310b6bd74187ae8934304c56d8b51f45c0.tar.gz
2003-01-18 Archie Cobbs <archie@dellroad.org>
* gnu/java/io/encode/EncoderUTF8.java (bytesInCharArray): Use offset. (convertToBytes): Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--gnu/java/io/encode/EncoderUTF8.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ad6f1437..82453e507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-18 Archie Cobbs <archie@dellroad.org>
+
+ * gnu/java/io/encode/EncoderUTF8.java (bytesInCharArray): Use offset.
+ (convertToBytes): Likewise.
+
2003-01-17 Tom Tromey <tromey@redhat.com>
* java/awt/Toolkit.java (default_toolkit_name): Use AWT_TOOLKIT.
diff --git a/gnu/java/io/encode/EncoderUTF8.java b/gnu/java/io/encode/EncoderUTF8.java
index ccbfaf839..a75bc39c3 100644
--- a/gnu/java/io/encode/EncoderUTF8.java
+++ b/gnu/java/io/encode/EncoderUTF8.java
@@ -1,5 +1,5 @@
/* EncoderUTF8.java -- Encoding class for the UTF-8 scheme
- Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -86,7 +86,7 @@ bytesInCharArray(char[] buf, int offset, int len)
{
int num_bytes = 0;
- for (int i = offset; i < len; i++)
+ for (int i = offset; i < offset + len; i++)
{
if (buf[i] <= 0x007F)
++num_bytes;
@@ -108,7 +108,7 @@ public byte[]
convertToBytes(char[] buf, int buf_offset, int len, byte[] bbuf,
int bbuf_offset)
{
- for (int i = buf_offset; i < len; i++)
+ for (int i = buf_offset; i < buf_offset + len; i++)
{
if (buf[i] <= 0x007F)
{