Eliminate use of read-substring! in favor of read-string!.

diff --git a/src/blowfish/blowfish.scm b/src/blowfish/blowfish.scm
index a7df5d1bbf8efc0daf141c16bb8a2a02905ef662..d10fd834cb462c799c0d446ee85872795d74903c 100644 (file)
--- a/src/blowfish/blowfish.scm
+++ b/src/blowfish/blowfish.scm
@@ -220,7 +220,7 @@ USA.
           (make-string 8 #\NUL))
          ((string=? blowfish-file-header-v2 line)
           (let ((init-vector (make-string 8)))
-            (if (not (= 8 (read-substring! init-vector 0 8 port)))
+            (if (not (= 8 (read-string! init-vector port)))
                 (error "Short read while getting init-vector:" port))
             init-vector))
          (else

diff --git a/src/imail/imail-util.scm b/src/imail/imail-util.scm
index ca9ba4f427d11cf02d94dc4b3fc96e8f26350c40..be1d565aeb74c3f83b88f5af7ec3a2db5fa3a819 100644 (file)
--- a/src/imail/imail-util.scm
+++ b/src/imail/imail-util.scm
@@ -429,7 +429,7 @@ USA.
        (let ((xstring (make-string n-bytes)))
          (let loop ((start 0))
            (if (< start n-bytes)
-               (let ((n-read (read-substring! xstring 0 n-bytes port)))
+               (let ((n-read (read-string! xstring port)))
                  (if (= n-read 0)
                      (error "Failed to read complete file:"
                             (+ start n-read) n-bytes pathname))

diff --git a/src/imail/imap-response.scm b/src/imail/imap-response.scm
index 9726fa1cea9fa86d01826f6f38d23167db770cc4..fdf79964c8e3b16c2f4e280f5e75a683f916ff76 100644 (file)
--- a/src/imail/imap-response.scm
+++ b/src/imail/imap-response.scm
@@ -550,7 +550,7 @@ USA.
     s))
 
 (define (read-substring!-internal string start end port)
-  (let ((n-read (read-substring! string start end port)))
+  (let ((n-read (read-string! string port start end)))
     (if imap-transcript-port
        (write-substring string start (+ start n-read) imap-transcript-port))
     n-read))

diff --git a/src/md5/md5.scm b/src/md5/md5.scm
index 8bdc1a7d815f3573eb17a5d0ef740e1835b9886e..0649f0555947d7db7ea14b961d43f202450ea1fe 100644 (file)
--- a/src/md5/md5.scm
+++ b/src/md5/md5.scm
@@ -76,7 +76,7 @@ USA.
                        unspecific)
                      (lambda ()
                        (let loop ()
-                         (let ((n (read-substring! buffer 0 4096 port)))
+                         (let ((n (read-string! buffer port)))
                            (if (fix:= 0 n)
                                (%md5-final context)
                                (begin

diff --git a/src/mhash/mhash.scm b/src/mhash/mhash.scm
index e0368f823fea594bf05a103c5f2e8b4e2ec28208..4ed16fe72e2af97d657efa110f16079fa5f8c20d 100644 (file)
--- a/src/mhash/mhash.scm
+++ b/src/mhash/mhash.scm
@@ -401,7 +401,7 @@ USA.
                        unspecific)
                      (lambda ()
                        (let loop ()
-                         (let ((n (read-substring! buffer 0 4096 port)))
+                         (let ((n (read-string! buffer port)))
                            (if (fix:= 0 n)
                                (mhash-end context)
                                (begin

diff --git a/src/runtime/blowfish.scm b/src/runtime/blowfish.scm
index 8515624bc16a9c4e1984d972bbc887c2e9809f2d..e2996c7aeafae65780bad364f3101464f4276fc1 100644 (file)
--- a/src/runtime/blowfish.scm
+++ b/src/runtime/blowfish.scm
@@ -88,7 +88,7 @@ USA.
           (make-string 8 #\NUL))
          ((string=? blowfish-file-header-v2 line)
           (let ((init-vector (make-string 8)))
-            (if (not (= 8 (read-substring! init-vector 0 8 port)))
+            (if (not (= 8 (read-string! init-vector port)))
                 (error "Short read while getting init-vector:" port))
             init-vector))
          (else

diff --git a/src/runtime/crypto.scm b/src/runtime/crypto.scm
index 0cd41a54e8192a253fea64ee89f1a31e22d87f59..10d8eeaa07c95c7ca6d4f11cde1e5ae1fa0b2847 100644 (file)
--- a/src/runtime/crypto.scm
+++ b/src/runtime/crypto.scm
@@ -248,7 +248,7 @@ USA.
                        unspecific)
                      (lambda ()
                        (let loop ()
-                         (let ((n (read-substring! buffer 0 4096 port)))
+                         (let ((n (read-string! buffer port)))
                            (if (fix:= 0 n)
                                (mhash-end context)
                                (begin
@@ -312,7 +312,7 @@ USA.
                        unspecific)
                      (lambda ()
                        (let loop ()
-                         (let ((n (read-substring! buffer 0 4096 port)))
+                         (let ((n (read-string! buffer port)))
                            (if (fix:= 0 n)
                                ((ucode-primitive md5-final 1) context)
                                (begin

diff --git a/src/runtime/httpio.scm b/src/runtime/httpio.scm
index 46b186d1af30c22ee6a19943cb3d6ee834fc95d5..212b4443fa596cd093659faf1cb4d1255875d0c5 100644 (file)
--- a/src/runtime/httpio.scm
+++ b/src/runtime/httpio.scm
@@ -286,7 +286,7 @@ USA.
   (let ((len (vector-8b-length buffer)))
     (let loop ((n n))
       (if (> n 0)
-         (let ((m (read-substring! buffer 0 (min n len) port)))
+         (let ((m (read-string! buffer port 0 (min n len))))
            (if (= m 0)
                (error "Premature EOF in HTTP message body."))
            (write-substring buffer 0 m output)

diff --git a/src/runtime/swank.scm b/src/runtime/swank.scm
index 175e19525bd349205eef45b330c239874c872d09..5ef162f774eb3feb42bea01251d5d7d7ec40457d 100644 (file)
--- a/src/runtime/swank.scm
+++ b/src/runtime/swank.scm
@@ -154,7 +154,7 @@ USA.
         (buffer (make-string end)))
     (let loop ((start 0))
       (if (< start end)
-         (loop (+ start (read-substring! buffer start end in)))
+         (loop (+ start (read-string! buffer in start end)))
          buffer))))
 
 (define (decode-message socket packet)

diff --git a/src/ssp/mod-lisp.scm b/src/ssp/mod-lisp.scm
index ad5c9479a4375918cdebf6ea041cc554e981f78b..686c56ecf6bf6246a7d49318cecbedef8646f953 100644 (file)
--- a/src/ssp/mod-lisp.scm
+++ b/src/ssp/mod-lisp.scm
@@ -214,7 +214,7 @@ USA.
          (let ((end (string-length entity)))
            (let loop ((start 0))
              (if (fix:< start end)
-                 (let ((n-read (read-substring! entity start end port)))
+                 (let ((n-read (read-string! entity port start end)))
                    (cond ((not n-read)
                           (loop start))
                          ((> n-read 0)