From 8dc1241068db5855115a9e25488a8962718a6c79 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sun, 27 Jul 2003 15:51:40 +0000 Subject: [PATCH] 0.8.2.5: Minor sb-simple-streams frobs... ... (member character), not (member 'character); ... pass END explicitly to DEVICE-WRITE (thanks to David Lichteblau). --- contrib/sb-simple-streams/fndb.lisp | 5 ++--- contrib/sb-simple-streams/simple-streams.lisp | 6 ++---- contrib/sb-simple-streams/strategy.lisp | 4 ++-- version.lisp-expr | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/contrib/sb-simple-streams/fndb.lisp b/contrib/sb-simple-streams/fndb.lisp index 1b28ec5..6d8579f 100644 --- a/contrib/sb-simple-streams/fndb.lisp +++ b/contrib/sb-simple-streams/fndb.lisp @@ -64,8 +64,7 @@ TODO (rudi 2003-05-19): make the above work, make (defknown open) use it. ||# -(handler-bind ((error #'(lambda (condition) (declare (ignore condition)) - (continue)))) +(handler-bind ((error #'continue)) (sb-c:defknown open (t &rest t &key (:direction (member :input :output :io :probe)) (:element-type sb-kernel:type-specifier) @@ -85,7 +84,7 @@ TODO (rudi 2003-05-19): make the above work, make (defknown open) use it. ) (sb-c:defknown listen (&optional sb-kernel:streamlike - (or null (integer 1 10) (member 'character))) + (or null (integer 1 10) (member character))) boolean (sb-c::unsafely-flushable sb-c::explicit-check)) (sb-c:defknown read-sequence (sequence stream &key (:start sb-int:index) diff --git a/contrib/sb-simple-streams/simple-streams.lisp b/contrib/sb-simple-streams/simple-streams.lisp index f83966b..31db6dd 100644 --- a/contrib/sb-simple-streams/simple-streams.lisp +++ b/contrib/sb-simple-streams/simple-streams.lisp @@ -345,16 +345,14 @@ start end blocking) (when (and (null buffer) (not (eql start end))) (with-stream-class (single-channel-simple-stream stream) - (setf buffer (sm buffer stream)) - (setf end (sm buffpos stream)))) + (setf buffer (sm buffer stream)))) (write-octets stream buffer start end blocking)) (defmethod device-write ((stream dual-channel-simple-stream) buffer start end blocking) (when (and (null buffer) (not (eql start end))) (with-stream-class (dual-channel-simple-stream stream) - (setf buffer (sm out-buffer stream)) - (setf end (sm outpos stream)))) + (setf buffer (sm out-buffer stream)))) (write-octets stream buffer start end blocking)) (defmethod device-clear-output ((stream simple-stream)) diff --git a/contrib/sb-simple-streams/strategy.lisp b/contrib/sb-simple-streams/strategy.lisp index 2538f74..8b0eb0c 100644 --- a/contrib/sb-simple-streams/strategy.lisp +++ b/contrib/sb-simple-streams/strategy.lisp @@ -46,7 +46,7 @@ (sm buffer-ptr stream) 0) (remove-stream-instance-flags stream :dirty) (return 0)) - (let ((bytes-written (device-write stream nil ptr nil blocking))) + (let ((bytes-written (device-write stream nil ptr bytes blocking))) (declare (fixnum bytes-written)) (when (minusp bytes-written) (error "DEVICE-WRITE error.")) @@ -73,7 +73,7 @@ (declare (type fixnum ptr bytes)) (loop (when (>= ptr bytes) (setf (sm outpos stream) 0) (return 0)) - (let ((bytes-written (device-write stream nil ptr nil blocking))) + (let ((bytes-written (device-write stream nil ptr bytes blocking))) (declare (fixnum bytes-written)) (when (minusp bytes-written) (error "DEVICE-WRITE error.")) diff --git a/version.lisp-expr b/version.lisp-expr index 9d2518b..b4f22d0 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.2.4" +"0.8.2.5" -- 1.7.10.4