From a77408febe12fb25c4d0d07c45c1f6b817bcbe73 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 21 Feb 2017 00:48:59 -0800 Subject: [PATCH] Eliminate references to flush-output. --- src/edwin/sendmail.scm | 2 +- src/edwin/webster.scm | 2 +- src/ffi/generator.scm | 2 +- src/imail/imail-imap.scm | 4 ++-- src/imail/imail-util.scm | 2 +- src/imail/imap-response.scm | 4 ++-- src/runtime/httpio.scm | 4 ++-- src/runtime/port.scm | 2 +- src/runtime/swank.scm | 4 ++-- src/runtime/usrint.scm | 18 +++++++++--------- src/ssp/mod-lisp.scm | 4 ++-- src/xdoc/xdoc.scm | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/edwin/sendmail.scm b/src/edwin/sendmail.scm index e0714d944..e97af0f95 100644 --- 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 f89e570d7..04571c7f9 100644 --- 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 9d29f1011..5c43d50da 100644 --- a/src/ffi/generator.scm +++ b/src/ffi/generator.scm @@ -517,7 +517,7 @@ Scm_"name" ("arglist") #include " (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 92988310b..8d5fe5c14 100644 --- 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 516f43f38..cf92ac1f1 100644 --- 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 757e22a3e..e975d88f3 100644 --- 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) diff --git a/src/runtime/httpio.scm b/src/runtime/httpio.scm index 7d8c971c8..e735ea3a1 100644 --- 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)) ;;;; Input diff --git a/src/runtime/port.scm b/src/runtime/port.scm index a48537aa1..ef1f05d59 100644 --- 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 aafb58ccd..08bfa405b 100644 --- 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 4f6a334f8..255be71f1 100644 --- 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 1ffc91baa..e4a0b4406 100644 --- 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 a543d094c..ddfe48635 100644 --- 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) -- 2.25.1