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

DataInputStream.java (readChar): Use readFully.

Browse Source 
* java/io/DataInputStream.java (readChar): Use readFully.
	(readInt): Likewise.
	(readLong): Likewise.
	(readShort): Likewise.
	(readUnsignedShort): Likewise.

From-SVN: r45834
This commit is contained in:
Tom Tromey 2001-09-26 22:49:02 +00:00 committed by Tom Tromey
parent 1e013d2ee5
commit 1685382e99
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2001-09-26 Tom Tromey <tromey@redhat.com>
* java/io/DataInputStream.java (readChar): Use readFully.
(readInt): Likewise.
(readLong): Likewise.
(readShort): Likewise.
(readUnsignedShort): Likewise.
2001-09-24 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/lang/PosixProcess.java (exitValue): Implement here. Throw

20
libjava/java/io/DataInputStream.java
View File

@ -173,9 +173,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
*/
public final char readChar() throws IOException
{
int count = in.read (buf, 0, 2);
if (count < 2)
throw new EOFException();
readFully (buf, 0, 2);
return convertToChar(buf);
}
@ -303,9 +301,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
*/
public final int readInt() throws IOException
{
int count = in.read (buf, 0, 4);
if (count < 4)
throw new EOFException();
readFully (buf, 0, 4);
return convertToInt(buf);
}
@ -453,9 +449,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
*/
public final long readLong() throws IOException
{
int count = in.read(buf, 0, 8);
if (count < 8)
throw new EOFException();
readFully (buf, 0, 8);
return convertToLong(buf);
}
@ -488,9 +482,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
*/
public final short readShort() throws IOException
{
int count = in.read(buf, 0, 2);
if (count < 2)
throw new EOFException();
readFully (buf, 0, 2);
return convertToShort(buf);
}
@ -542,9 +534,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
*/
public final int readUnsignedShort() throws IOException
{
int count = in.read(buf, 0, 2);
if (count < 2)
throw new EOFException();
readFully (buf, 0, 2);
return convertToUnsignedShort(buf);
}