procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BufferedReader.java (sbuf): New field.

Browse source 
* java/io/BufferedReader.java (sbuf): New field.
	(readLine): Use String.valueOf instead of new String() as per
	Per Bothner's suggestion. Use instance sbuf field instead of a
	local StringBuffer instance.
	* java/io/InputStreamReader.java (read(char[],int,int)): Pass the
	caller's buffer to refill().
	(read(void)): Pass our internal work buffer to refill if our
	input queue is empty.
	(refill): Changed return type to int. Use the specified buffer
	instead of our work buffer as per Bryce McKinlay's suggestion.
	Return the number of characters read or -1 for EOF.

From-SVN: r76927
This commit is contained in:
Mohan Embar 2004-01-30 06:33:43 +00:00 • committed by Mohan Embar
parent eadccbea12
commit ae30b3b25d
3 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libjava/java/io/InputStreamReader.java
View file

@ -1,5 +1,5 @@
/* InputStreamReader.java -- Reader than transforms bytes to chars
Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -231,10 +231,8 @@ public class InputStreamReader extends Reader
int wavail = wcount - wpos;
if (wavail <= 0)
{
// Nothing waiting, so refill our buffer.
if (! refill ())
return -1;
wavail = wcount - wpos;
// Nothing waiting, so refill their buffer.
return refill(buf, offset, length);
}
if (length > wavail)
@ -262,24 +260,24 @@ public class InputStreamReader extends Reader
int wavail = wcount - wpos;
if (wavail <= 0)
{
// Nothing waiting, so refill our buffer.
if (! refill ())
// Nothing waiting, so refill our internal buffer.
wpos = wcount = 0;
if (work == null)
work = new char[100];
int count = refill(work, 0, work.length);
if (count == -1)
return -1;
wcount += count;
}
return work[wpos++];
}
}
// Read more bytes and convert them into the WORK buffer.
// Return false on EOF.
private boolean refill () throws IOException
// Read more bytes and convert them into the specified buffer.
// Returns the number of converted characters or -1 on EOF.
private int refill(char[] buf, int offset, int length) throws IOException
{
wcount = wpos = 0;
if (work == null)
work = new char[100];
for (;;)
{
// We have knowledge of the internals of BufferedInputStream
@ -290,17 +288,13 @@ public class InputStreamReader extends Reader
boolean r = in.pos < in.count || in.refill ();
in.reset ();
if (! r)
return false;
return -1;
converter.setInput(in.buf, in.pos, in.count);
int count = converter.read (work, wpos, work.length - wpos);
int count = converter.read(buf, offset, length);
in.skip(converter.inpos - in.pos);
if (count > 0)
{
wcount += count;
return true;
}
return count;
}
}
} // class InputStreamReader