Eliminate references to flush-output.

diff --git a/src/edwin/sendmail.scm b/src/edwin/sendmail.scm
index e0714d944e2cb9ce8d63337e5fa4a0b745a5f804..e97af0f95527d5b53b869d567879e46bd11d4a81 100644 (file)
--- a/src/edwin/sendmail.scm
+++ b/src/edwin/sendmail.scm
@@ -1097,7 +1097,7 @@ the user from the mailer."
   (newline (smtp-port-port port)))
 
 (define (smtp-drain-output port)
-  (flush-output (smtp-port-port port)))
+  (flush-output-port (smtp-port-port port)))
 
 (define (smtp-trace-write-string string port)
   (let ((trace-buffer (smtp-port-trace-buffer port)))

diff --git a/src/edwin/webster.scm b/src/edwin/webster.scm
index f89e570d7719d95ec7b15815c167a9c38e4298ad..04571c7f99fc994cf899ba011733353e1cb2ab46 100644 (file)
--- a/src/edwin/webster.scm
+++ b/src/edwin/webster.scm
@@ -37,7 +37,7 @@ USA.
   (write-string " " webster-server-port)
   (write-string word webster-server-port)
   (newline webster-server-port)
-  (flush-output webster-server-port)
+  (flush-output-port webster-server-port)
   (let ((line (read-line webster-server-port)))
     (cond ((string=? "SPELLING 0" line)
           (message "Word not found."))

diff --git a/src/ffi/generator.scm b/src/ffi/generator.scm
index 9d29f1011e271b4b8a24157ad10c071a2c85e06e..5c43d50da71f3d20a70686257d5e88156396e0f1 100644 (file)
--- a/src/ffi/generator.scm
+++ b/src/ffi/generator.scm
@@ -517,7 +517,7 @@ Scm_"name" ("arglist")
 
 #include <stdio.h>
 " (basics-grovel-func) (enums-grovel-func includes)))
-      (flush-output)
+      (flush-output-port)
       (let* ((structs (gen-struct-grovel-funcs includes))
             (unions (gen-union-grovel-funcs includes)))
        (let ((library (c-includes/library includes)))

diff --git a/src/imail/imail-imap.scm b/src/imail/imail-imap.scm
index 92988310bba9140a956cf80760ce0939c3e23f1d..8d5fe5c149b95bb480a91e5119d1c647f7a43fc2 100644 (file)
--- a/src/imail/imail-imap.scm
+++ b/src/imail/imail-imap.scm
@@ -2573,7 +2573,7 @@ USA.
                                        (cddr arguments))
                                 arguments))
                      imap-trace-port)
-         (flush-output imap-trace-port)))
+         (flush-output-port imap-trace-port)))
     (imap-transcript-write-string tag port)
     (imap-transcript-write-char #\space port)
     (imap-transcript-write-string (symbol->string command) port)
@@ -2662,7 +2662,7 @@ USA.
     (if imap-trace-port
        (begin
          (write-line (list 'RECEIVE response) imap-trace-port)
-         (flush-output imap-trace-port)))
+         (flush-output-port imap-trace-port)))
     response))
 
 (define (imap:catch-no-response predicate thunk)

diff --git a/src/imail/imail-util.scm b/src/imail/imail-util.scm
index 516f43f380cdf8e3854036ecfad0fa962afd59b7..cf92ac1f1889a43e1ef44fe569f38eb2586f60b1 100644 (file)
--- a/src/imail/imail-util.scm
+++ b/src/imail/imail-util.scm
@@ -643,7 +643,7 @@ USA.
            (begin
              (write-line (cons* 'OBJECT-EVENT object type arguments)
                          imap-trace-port)
-             (flush-output imap-trace-port)))
+             (flush-output-port imap-trace-port)))
        (event-distributor/invoke! (object-modification-event object)
                                   object
                                   type

diff --git a/src/imail/imap-response.scm b/src/imail/imap-response.scm
index 757e22a3ed5e457cc4708e5f885077726d319e62..e975d88f39c25f5a4f4288e533c13d824d4b2827 100644 (file)
--- a/src/imail/imap-response.scm
+++ b/src/imail/imap-response.scm
@@ -587,9 +587,9 @@ USA.
       (write object imap-transcript-port)))
 
 (define (imap-transcript-flush-output port)
-  (flush-output port)
+  (flush-output-port port)
   (if imap-transcript-port
-      (flush-output imap-transcript-port)))
+      (flush-output-port imap-transcript-port)))
 
 (define imap-transcript-port #f)
 \f

diff --git a/src/runtime/httpio.scm b/src/runtime/httpio.scm
index 7d8c971c83d66b28ead53229a23910c5698c13e5..e735ea3a1989e832203a213081d33f7ff77fcd92 100644 (file)
--- a/src/runtime/httpio.scm
+++ b/src/runtime/httpio.scm
@@ -184,7 +184,7 @@ USA.
        (write-string (http-request-body request) port))
       (begin
        (newline port)))
-  (flush-output port))
+  (flush-output-port port))
 
 (define (write-http-response response port)
   (if (http-response-version response)
@@ -199,7 +199,7 @@ USA.
        (write-http-headers (http-response-headers response) port)))
   (%binary-mode port)
   (write-string (http-response-body response) port)
-  (flush-output port))
+  (flush-output-port port))
 \f
 ;;;; Input
 

diff --git a/src/runtime/port.scm b/src/runtime/port.scm
index a48537aa11c483342ba3ffcef6e5ebf19cecafe6..ef1f05d59e5542fe4af9318566e287f7379d665d 100644 (file)
--- a/src/runtime/port.scm
+++ b/src/runtime/port.scm
@@ -540,7 +540,7 @@ USA.
 (define (flush-transcript port)
   (let ((tport (textual-port-transcript port)))
     (if tport
-       (flush-output tport))))
+       (flush-output-port tport))))
 
 (define (discretionary-flush-transcript port)
   (let ((tport (textual-port-transcript port)))

diff --git a/src/runtime/swank.scm b/src/runtime/swank.scm
index aafb58ccd557a74649a61dddd0570b030d3a89e5..08bfa405ba39d52e84df83614ac8c3ab01817564 100644 (file)
--- a/src/runtime/swank.scm
+++ b/src/runtime/swank.scm
@@ -176,7 +176,7 @@ USA.
        (error "Expression length exceeds 24 bits:" s))
     (write-string (string-pad-left s 6 #\0) out))
   (write-string packet out)
-  (flush-output out))
+  (flush-output-port out))
 
 (define (dispatch message socket level)
   (let ((p
@@ -307,7 +307,7 @@ USA.
     (dynamic-wind
        (lambda () unspecific)
        (lambda () (with-output-to-port p thunk))
-       (lambda () (flush-output p)))))
+       (lambda () (flush-output-port p)))))
 
 (define repl-port-type)
 (define (initialize-package!)

diff --git a/src/runtime/usrint.scm b/src/runtime/usrint.scm
index 4f6a334f8c0639cea0372614d426d8bfa45dd2b5..255be71f165070b71c344ded92e91853ea25be04 100644 (file)
--- a/src/runtime/usrint.scm
+++ b/src/runtime/usrint.scm
@@ -77,7 +77,7 @@ USA.
                (fresh-line port)
                (newline port)
                (write-string prompt port)
-               (flush-output port)))
+               (flush-output-port port)))
            (with-input-port-terminal-mode port 'COOKED
              (lambda ()
                (read port environment))))))))
@@ -115,7 +115,7 @@ USA.
            (with-output-port-terminal-mode port 'COOKED
              (lambda ()
                (write-char char port)
-               (flush-output port)))
+               (flush-output-port port)))
            char)
          (loop)))))
 
@@ -136,7 +136,7 @@ USA.
       (lambda ()
        (newline port)
        (write-string prompt port)
-       (flush-output port)))
+       (flush-output-port port)))
     (let ((char
           (with-input-port-terminal-mode port 'RAW
             (lambda ()
@@ -146,13 +146,13 @@ USA.
         (with-output-port-terminal-mode port 'COOKED
           (lambda ()
             (write-string "Yes" port)
-            (flush-output port)))
+            (flush-output-port port)))
         true)
        ((#\n #\N #\rubout)
         (with-output-port-terminal-mode port 'COOKED
           (lambda ()
             (write-string "No" port)
-            (flush-output port)))
+            (flush-output-port port)))
         false)
        ((#\newline)
         (loop))
@@ -161,7 +161,7 @@ USA.
           (lambda ()
             (write char port)
             (beep port)
-            (flush-output port)))
+            (flush-output-port port)))
         (loop))))))
 
 (define (prompt-for-string prompt #!optional port)
@@ -178,7 +178,7 @@ USA.
       (fresh-line port)
       (newline port)
       (write-string prompt port)
-      (flush-output port)))
+      (flush-output-port port)))
   (with-input-port-terminal-mode port 'COOKED
     (lambda ()
       (read-line port))))
@@ -242,7 +242,7 @@ USA.
       (fresh-line port)
       (newline port)
       (write-string (canonicalize-prompt prompt ": ") port)
-      (flush-output port)))
+      (flush-output-port port)))
   (let loop ((input ""))
     (let ((char (with-binary-line-ending
                 (lambda ()
@@ -298,7 +298,7 @@ USA.
                (write-string " " port)
                (write-string (cdr prompt) port))
              (write-string prompt port))
-         (flush-output port)))))
+         (flush-output-port port)))))
 
 ;;;; Debugger Support
 

diff --git a/src/ssp/mod-lisp.scm b/src/ssp/mod-lisp.scm
index 1ffc91baaedfa9ee4f968143c7ec470a7b33abad..e4a0b44068b12af4d812d4b4e9f9749152ea7559 100644 (file)
--- a/src/ssp/mod-lisp.scm
+++ b/src/ssp/mod-lisp.scm
@@ -63,7 +63,7 @@ USA.
                           (status-response 500 (condition->html response))
                           response))))
               port)
-             (flush-output port))
+             (flush-output-port port))
            (lambda ()
              (transcript-off port)
              (close-port port))))))
@@ -836,6 +836,6 @@ USA.
                          (http-request-user-name)
                          (http-message-post-parameters request))
                    request-log-port)
-       (flush-output request-log-port))))
+       (flush-output-port request-log-port))))
 
 (define request-log-port #f)
\ No newline at end of file

diff --git a/src/xdoc/xdoc.scm b/src/xdoc/xdoc.scm
index a543d094cce64aad4ae7db6f6cd256c02d7dc60c..ddfe486350585110805f18cf0ca0fddbd231a541 100644 (file)
--- a/src/xdoc/xdoc.scm
+++ b/src/xdoc/xdoc.scm
@@ -100,7 +100,7 @@ USA.
                (begin
                  (write-xml document *trace-expansion-port*)
                  (fresh-line *trace-expansion-port*)
-                 (flush-output *trace-expansion-port*)))
+                 (flush-output-port *trace-expansion-port*)))
            (procedure document)))))))
 
 (define (trace-expansion filename)