X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-simple-streams%2Fsimple-streams.lisp;h=4caf28aae95eb66cd5962b09f03718a278441818;hb=b7cfa0e5e726c2037ba2c6cb32406ff7e9764dd2;hp=47ab39937d300c0a050cead6e1422d9544bfeabe;hpb=ce58e434470b1ebefae6132d9c075c7d8a2c0c13;p=sbcl.git diff --git a/contrib/sb-simple-streams/simple-streams.lisp b/contrib/sb-simple-streams/simple-streams.lisp index 47ab399..4caf28a 100644 --- a/contrib/sb-simple-streams/simple-streams.lisp +++ b/contrib/sb-simple-streams/simple-streams.lisp @@ -240,7 +240,7 @@ ;; Handle encapsulated stream. FIXME: perhaps handle ;; sbcl-vintage ansi-stream type in read-octets too? (stream (read-octets fd buffer start end blocking)) - (t (error "Don't know how to handle input handle &S" fd)))))) + (t (error "Don't know how to handle input handle ~S" fd)))))) (defun write-octets (stream buffer start end blocking) (declare (type simple-stream stream) @@ -278,7 +278,7 @@ ;; Handle encapsulated stream. FIXME: perhaps handle ;; sbcl-vintage ansi-stream type in write-octets too? (stream (write-octets fd buffer start end blocking)) - (t (error "Don't know how to handle output handle &A" fd)))))) + (t (error "Don't know how to handle output handle ~A" fd)))))) ;;; @@ -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))