extra: contents -> read-contents

diff --git a/basis/xml/errors/errors.factor b/basis/xml/errors/errors.factor
index 3b73e8a7a9b61f084d7a8fff5d908b2afdf366e9..7640822d9cae7921b94905c26d583f7f6a5480c9 100644 (file)
--- a/basis/xml/errors/errors.factor
+++ b/basis/xml/errors/errors.factor
@@ -100,7 +100,7 @@ XML-ERROR: bad-cdata ;
 
 XML-ERROR: not-enough-characters ;
 
-XML-ERROR: bad-doctype contents ;
+XML-ERROR: bad-doctype read-contents ;
 
 XML-ERROR: bad-encoding encoding ;
 

diff --git a/extra/benchmark/tcp-echo0/tcp-echo0.factor b/extra/benchmark/tcp-echo0/tcp-echo0.factor
index 3155ae68f53bd169f30b93b6f70bd11807a58a50..4e81ffeb1ca81751b4dd87c82d91997b76240d0f 100644 (file)
--- a/extra/benchmark/tcp-echo0/tcp-echo0.factor
+++ b/extra/benchmark/tcp-echo0/tcp-echo0.factor
@@ -46,7 +46,7 @@ M: tcp-echo handle-client*
     <tcp-echo> [
         \ threaded-server get server>address binary [
             #times [ #bytes read-write ] times
-            contents empty? [ incorrect-#bytes ] unless
+            read-contents empty? [ incorrect-#bytes ] unless
         ] with-client
     ] with-threaded-server ;
 

diff --git a/extra/gopher/gopher.factor b/extra/gopher/gopher.factor
index 5104238c6dc0a151d3623ca1c13f0ad7fc542de1..2fdf6e25a52d761f1c17d2546a62155fff4f0746 100644 (file)
--- a/extra/gopher/gopher.factor
+++ b/extra/gopher/gopher.factor
@@ -42,7 +42,7 @@ CONSTANT: A_PLUS_SOUND CHAR: <
 : gopher-get ( selector -- item-type byte-array )
     "/" split1 "" or [ first ] dip
     "?" split1 [ "\t" glue ] when*
-    "\r\n" append utf8 encode write flush contents ;
+    "\r\n" append utf8 encode write flush read-contents ;
 
 PRIVATE>
 

diff --git a/extra/images/jpeg/jpeg.factor b/extra/images/jpeg/jpeg.factor
index 7050e5251494235b55550f9c6ef8a902c3a1a0a3..9422bfe8e607ef209de953f2b921ff22eb4e5a81 100644 (file)
--- a/extra/images/jpeg/jpeg.factor
+++ b/extra/images/jpeg/jpeg.factor
@@ -363,7 +363,7 @@ ERROR: not-a-jpeg-image ;
     [
         parse-marker { SOI } = [ not-a-jpeg-image ] unless
         parse-headers
-        contents <loading-jpeg>
+        read-contents <loading-jpeg>
     ] with-input-stream ;
 
 PRIVATE>

diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor
index c5a195d546e6cf6f46c661a293e7bb50d39a1751..d6d4e5639d4033497e18d5d806b4399a7091983e 100644 (file)
--- a/extra/images/png/png.factor
+++ b/extra/images/png/png.factor
@@ -97,7 +97,7 @@ ERROR: bad-checksum ;
 
 : <icc-profile> ( byte-array -- icc-profile )
     binary [
-        read-png-string read1 drop contents zlib-inflate
+        read-png-string read1 drop read-contents zlib-inflate
     ] with-byte-reader icc-profile boa ;
 
 : <itext> ( byte-array -- itext )