aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/BufferedReader.java11
2 files changed, 11 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cbf9a89..45febe3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-05 Tom Tromey <tromey@redhat.com>
+
+ * java/io/BufferedReader.java (skip): Removed unused
+ variable.
+
2004-05-05 Michael Koch <konqueror@gmx.de>
* java/awt/FileDialog.java: Import java.io.Serializable explicitly.
diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java
index 9175d4e..444b66d 100644
--- a/libjava/java/io/BufferedReader.java
+++ b/libjava/java/io/BufferedReader.java
@@ -533,12 +533,13 @@ public class BufferedReader extends Reader
// skip the '\n' for us). By doing this, we'll have to back up pos.
// That's easier than trying to keep track of whether we've skipped
// one element or not.
- int ch;
if (pos > limit)
- if ((ch = read()) < 0)
- return 0;
- else
- --pos;
+ {
+ if (read() < 0)
+ return 0;
+ else
+ --pos;
+ }
int avail = limit - pos;