[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanup in InflaterInputStream

[Kaffe CVS]

PatchSet 5510 
Date: 2004/12/02 22:39:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small cleanup in InflaterInputStream

2004-12-02  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/util/zip/InflaterInputStream.java:
        Resynced with GNU Classpath.

        2004-11-23  Michael Koch  <konqueror at gmx.de>

        * java/util/zip/InflaterInputStream.java
        (onebytebuffer): Little reformatting to match libgcj's version.
        (read): Likewise.

Members: 
	ChangeLog:1.3056->1.3057 
	libraries/javalib/java/util/zip/InflaterInputStream.java:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3056 kaffe/ChangeLog:1.3057
--- kaffe/ChangeLog:1.3056	Thu Dec  2 22:30:35 2004
+++ kaffe/ChangeLog	Thu Dec  2 22:39:39 2004
@@ -1,5 +1,16 @@
 2004-12-02  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/util/zip/InflaterInputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-11-23  Michael Koch  <konqueror at gmx.de>
+
+        * java/util/zip/InflaterInputStream.java
+        (onebytebuffer): Little reformatting to match libgcj's version.
+        (read): Likewise.
+
+2004-12-02  Dalibor Topic  <robilad at kaffe.org>
+
 	* include/Makefile.am:
 	Removed gnu_java_nio_NIOServerSocket.h.
 
Index: kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.14 kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.15
--- kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.14	Thu Nov 11 00:32:44 2004
+++ kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java	Thu Dec  2 22:39:41 2004
@@ -71,9 +71,8 @@
    */
   protected int len;
 
-  /*
-   * We just use this if we are decoding one byte at a time with the read() call
-   */
+  // We just use this if we are decoding one byte at a time with the
+  // read() call.
   private byte[] onebytebuffer = new byte[1];
 
   /**
@@ -168,11 +167,9 @@
    */
   public int read() throws IOException
   { 
-    int nread = read(onebytebuffer, 0, 1); //read one byte
-    
+    int nread = read(onebytebuffer, 0, 1);
     if (nread > 0)
       return onebytebuffer[0] & 0xff;
-    
     return -1;
   }