[kaffe] CVS kaffe (dalibor): Resynced with GNU classpath: removed unused variable in BufferedReader

Kaffe CVS cvs-commits at kaffe.org
Tue May 18 06:11:03 PDT 2004


PatchSet 4745 
Date: 2004/05/18 12:33:46
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: removed unused variable in BufferedReader

2004-05-18  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/BufferedReader.java:
        Resynced with GNU Classpath.

        2004-04-28  Tom Tromey  <tromey at redhat.com>

        * java/io/BufferedReader.java (skip): Removed unused
        variable.

Members: 
	ChangeLog:1.2318->1.2319 
	libraries/javalib/java/io/BufferedReader.java:1.15->1.16 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2318 kaffe/ChangeLog:1.2319
--- kaffe/ChangeLog:1.2318	Tue May 18 03:34:50 2004
+++ kaffe/ChangeLog	Tue May 18 12:33:46 2004
@@ -1,5 +1,15 @@
 2004-05-18  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/BufferedReader.java:
+	Resynced with GNU Classpath.
+	
+	2004-04-28  Tom Tromey  <tromey at redhat.com>
+
+	* java/io/BufferedReader.java (skip): Removed unused
+	variable.
+
+2004-05-18  Dalibor Topic  <robilad at kaffe.org>
+
         * include/Makefile.am:
 	(NOINSTALL_DERIVED_HDRS) Added java_io_VMFile.h.
 	
Index: kaffe/libraries/javalib/java/io/BufferedReader.java
diff -u kaffe/libraries/javalib/java/io/BufferedReader.java:1.15 kaffe/libraries/javalib/java/io/BufferedReader.java:1.16
--- kaffe/libraries/javalib/java/io/BufferedReader.java:1.15	Tue Mar 16 17:44:35 2004
+++ kaffe/libraries/javalib/java/io/BufferedReader.java	Tue May 18 12:33:48 2004
@@ -533,12 +533,13 @@
 	// 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;
 




More information about the kaffe mailing list