[armedbear-cvs] r11974 - trunk/abcl/src/org/armedbear/lisp/util

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Jun  1 05:25:01 2009
New Revision: 11974

Log:
Remove pointingAtEOF(); it was used only once
and the same information is available at lower cost.

Modified:
   trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java

Modified: trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java	Mon Jun  1 05:25:01 2009
@@ -354,7 +354,7 @@
         while ((cbuf.remaining() > 0) && dataIsAvailableForRead() && ! atEof) {
 
             atEof = ! ensureReadBbuf(decodeWasUnderflow);
-            CoderResult r = cdec.decode(bbuf, cbuf, pointingAtEOF() );
+            CoderResult r = cdec.decode(bbuf, cbuf, atEof);
             decodeWasUnderflow = (CoderResult.UNDERFLOW == r);
         }
         if (cbuf.remaining() == len) {
@@ -367,10 +367,6 @@
     private boolean dataIsAvailableForRead() throws IOException {
         return ((bbuf.remaining() > 0) || (fcn.position() < fcn.size()));
     }
-	
-    private boolean pointingAtEOF() {
-        return (bbuf.remaining() == 0) && (fcnpos == fcnsize);
-    }
 
     private void write(char[] cb, int off, int len) throws IOException {
         CharBuffer cbuf = CharBuffer.wrap(cb, off, len);