Changeset 9869 for trunk/source/level-1/l1-sysio.lisp

Timestamp:

Jul 1, 2008, 9:22:25 PM (11 years ago)

Author:

gz

Message:

Propagate r9804,r9805 here from working-0711

File:

• trunk/source/level-1/l1-sysio.lisp (modified) (2 diffs)

trunk/source/level-1/l1-sysio.lisp

@@ -509 +509 @@
 (defun input-file-ioblock-advance (stream file-ioblock read-p)
   (let* ((newpos (+ (file-ioblock-octet-pos file-ioblock)
-                    (io-buffer-count (file-ioblock-inbuf file-ioblock))))
-         (curpos (ioblock-octets-to-elements
-                  file-ioblock
-                  (file-octet-filepos file-ioblock))))
-    (unless (eql newpos curpos)
-      (error "Expected newpos to be ~d, fd is at ~d" newpos curpos))
+                    (io-buffer-count (file-ioblock-inbuf file-ioblock)))))
     (setf (file-ioblock-octet-pos file-ioblock) newpos)
     (fd-stream-advance stream file-ioblock read-p)))
@@ -536 +531 @@
                     
 (defun output-file-force-output (stream file-ioblock count finish-p)
-  ;; Check to see if we're where we think we should be.
-  (let* ((curpos (file-ioblock-octet-pos file-ioblock)))
-    (unless (eql curpos (file-octet-filepos file-ioblock))
-      (error "Expected newpos to be ~d, fd is at ~d"
-             curpos (file-octet-filepos file-ioblock)))
-    (let* ((n (fd-stream-force-output stream file-ioblock count finish-p)))
-      (incf (file-ioblock-octet-pos file-ioblock) (or n 0))
-      n)))
+  (let* ((n (fd-stream-force-output stream file-ioblock count finish-p)))
+    (incf (file-ioblock-octet-pos file-ioblock) (or n 0))
+    n))
 
 ;;; Can't be sure where the underlying fd is positioned, so seek first.