* java/io/ObjectStreamField.java: Cleaned up imports.

	* javax/imageio/stream/ImageInputStream.java: Removed unused import.
	* java/io/BufferedReader.java (skip): Removed unused
	variable.

4 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ac4b058b..fd01693a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* java/io/ObjectStreamField.java: Cleaned up imports.
+	* javax/imageio/stream/ImageInputStream.java: Removed unused import.
+	* java/io/BufferedReader.java (skip): Removed unused
+	variable.
+
 2004-04-28  Michael Koch  <konqueror@gmx.de>
 
 	* include/jni.h.in (GetStringUTFChars):
diff --git a/java/io/BufferedReader.java b/java/io/BufferedReader.java
index 9175d4e89..444b66de4 100644
--- a/java/io/BufferedReader.java
+++ b/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;
 
diff --git a/java/io/ObjectStreamField.java b/java/io/ObjectStreamField.java
index e4f11af99..a07dd6bb8 100644
--- a/java/io/ObjectStreamField.java
+++ b/java/io/ObjectStreamField.java
@@ -39,8 +39,8 @@ exception statement from your version. */
 package java.io;
 
 import gnu.java.lang.reflect.TypeSignature;
+
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
diff --git a/javax/imageio/stream/ImageInputStream.java b/javax/imageio/stream/ImageInputStream.java
index 4b509f857..d37231dd7 100644
--- a/javax/imageio/stream/ImageInputStream.java
+++ b/javax/imageio/stream/ImageInputStream.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 package javax.imageio.stream;
 
 import java.io.DataInput;
-import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteOrder;