1999-07-01 Warren Levy <warrenl@cygnus.com>

	* gnu/gcj/convert/BytesToUnicode.java (read): Changed outlength
	to count and revised comments to match.
	* gnu/gcj/convert/Input_EUCJIS.java (read): Same as Input_8859_1.java.
	* gnu/gcj/convert/Input_JavaSrc.java (read): ditto.
	* gnu/gcj/convert/Input_SJIS.java (read): ditto.
	* gnu/gcj/convert/Input_UTF8.java (read): ditto.
	* gnu/gcj/convert/natInput_EUCJIS.cc (read): ditto.
	* gnu/gcj/convert/natInput_SJIS.cc (read): ditto.
1999-07-01  John-Marc Chandonia  <jmc@cmpharm.ucsf.edu>
	* gnu/gcj/convert/Input_8859_1.java (read): Use 3rd parameter
	properly as count rather than outlength.
	* java/io/BufferedOutputStream.java (write(byte[],int,int): Flush
	output on overflow rather than buffer fill.
	* java/io/BufferedReader.java (fill): Don't clear out the buffer
	if markPos is 0 and there is still room in the buffer.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27892 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 5 deletions

diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java
index cfcb813c9cf..6e4d15dab9f 100644
--- a/libjava/gnu/gcj/convert/BytesToUnicode.java
+++ b/libjava/gnu/gcj/convert/BytesToUnicode.java
@@ -91,15 +91,17 @@ public abstract class BytesToUnicode
    * bytes start at inbuffer[inpos], and end at inbuffer[inlength-1].
    * @param outbuffer buffer for the converted character
    * @param outpos position in buffer to start putting converted characters
-   * @param outlength the maximum number of characters to convert
+   * @param count the maximum number of characters to convert
    * @return number of chars placed in outbuffer.
    * Also, this.inpos is incremented by the number of bytes consumed.
    *
    * (Note the asymmetry in that the input upper bound is inbuffer[inlength-1],
-   * while the output upper bound is outbuffer[outpos+outlength-1].  The
+   * while the output upper bound is outbuffer[outpos+count-1].  The
    * justification is that inlength is like the count field of a
-   * BufferedInputStream, while the outlength parameter is like the
-   * length parameter of a read request.)
+   * BufferedInputStream, while the count parameter is like the
+   * length parameter of a read request.)  The count parameter is
+   * also defined to be <= outbuffer.length - outpos (per the specification
+   * of the length parameter for a read request).
    */
-  public abstract int read (char[] outbuffer, int outpos, int outlength);
+  public abstract int read (char[] outbuffer, int outpos, int count);
 }