Revert change in re SET-STRING-MAXIMUM-LENGTH

diff --git a/src/runtime/input.scm b/src/runtime/input.scm
index cee7108d66e94644a7dac6396bdf23b1e8104d96..18bb216692f2eba0bf2b91a0095549cd2a1f07d5 100644 (file)
--- a/src/runtime/input.scm
+++ b/src/runtime/input.scm
@@ -103,11 +103,7 @@ USA.
 
 (define-integrable (accum->string a)
   (set-string-maximum-length! (car a) (cdr a))
-  ;; jrm's port cannot resize strings, so if the
-  ;; resize didn't work, just take the substring.
-  (if (fix:= (string-maximum-length (car a)) (cdr a))
-      (car a)
-      (substring (car a) 0 (cdr a))))
+  (car a))
 
 (define-integrable (accum-count a)
   (cdr a))

diff --git a/src/runtime/pgsql.scm b/src/runtime/pgsql.scm
index 03b72625a6434031348c63bcfc66e6d44b164940..2840b162a9ec69acc46081d16b1b619916e09dce 100644 (file)
--- a/src/runtime/pgsql.scm
+++ b/src/runtime/pgsql.scm
@@ -301,9 +301,7 @@ USA.
   (let* ((escaped (make-string (fix:* 2 (string-length string))))
         (length  (pq-escape-string string escaped)))
     (set-string-maximum-length! escaped length)
-    (if (fix:= (string-maximum-length escaped) length)
-       escaped
-       (substring escaped 0 length))))
+    escaped))
 
 (define (encode-pgsql-bytea bytes)
   (guarantee-pgsql-available)

diff --git a/src/runtime/stringio.scm b/src/runtime/stringio.scm
index 3c821c8a76d0c7858be980c246f9f7310f297a47..a43de3381c3c532b7f7c457c5c460f2737cca72b 100644 (file)
--- a/src/runtime/stringio.scm
+++ b/src/runtime/stringio.scm
@@ -423,13 +423,10 @@ USA.
 
 (define (narrow-out/extract-output! port)
   (let* ((os (port/state port))
-        (string (ostate-buffer os))
-        (length (ostate-index os)))
-    (set-string-maximum-length! string length)
+        (string (ostate-buffer os)))
+    (set-string-maximum-length! string (ostate-index os))
     (reset-buffer! os)
-    (if (fix:= (string-maximum-length string) length)
-       string
-       (substring string 0 length))))
+    string))
 
 (define (make-wide-output-type)
   (make-string-out-type wide-out/write-char
@@ -607,14 +604,11 @@ USA.
 (define (octets-out/extract-output! port)
   (output-port/flush-output port)
   (let* ((os (output-octets-port/os port))
-        (octets (ostate-buffer os))
-        (length (ostate-index os)))
-      (set-string-maximum-length! octets length)
-      (set-ostate-buffer! os (make-vector-8b 16))
-      (set-ostate-index! os 0)
-      (if (fix:= (string-maximum-length octets) length)
-         octets
-         (substring octets 0 length))))
+        (octets (ostate-buffer os)))
+    (set-string-maximum-length! octets (ostate-index os))
+    (set-ostate-buffer! os (make-vector-8b 16))
+    (set-ostate-index! os 0)
+    octets))
 
 (define (octets-out/position port)
   (output-port/flush-output port)