Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision 85d8153362477eb1dea347a576c25be02bf7fa07)
+++ libcfa/src/fstream.cfa	(revision b43151554ff02e51061ab185ce928a72bf46fbce)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 20 19:04:46 2021
-// Update Count     : 425
+// Last Modified On : Sat Apr 24 09:05:16 2021
+// Update Count     : 426
 //
 
@@ -19,7 +19,5 @@
 #include <stdlib.h>										// exit
 #include <stdarg.h>										// varargs
-#include <string.h>										// strlen
-#include <float.h>										// DBL_DIG, LDBL_DIG
-#include <complex.h>									// creal, cimag
+#include <string.h>										// strncpy, strerror
 #include <assert.h>
 #include <errno.h>										// errno
@@ -93,6 +91,6 @@
 void sepSet( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.separator$, s, sepSize - 1 );
-	os.separator$[sepSize - 1] = '\0';
+	strncpy( os.separator$, s, ofstream_sepSize - 1 );
+	os.separator$[ofstream_sepSize - 1] = '\0';
 } // sepSet
 
@@ -100,6 +98,6 @@
 void sepSetTuple( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.tupleSeparator$, s, sepSize - 1 );
-	os.tupleSeparator$[sepSize - 1] = '\0';
+	strncpy( os.tupleSeparator$, s, ofstream_sepSize - 1 );
+	os.tupleSeparator$[ofstream_sepSize - 1] = '\0';
 } // sepSet
 
@@ -112,5 +110,5 @@
 } // ends
 
-int fail( ofstream & os ) {
+bool fail( ofstream & os ) {
 	return os.file$ == 0 || ferror( (FILE *)(os.file$) );
 } // fail
@@ -228,5 +226,5 @@
 bool getANL( ifstream & os ) { return os.nlOnOff$; }
 
-int fail( ifstream & is ) {
+bool fail( ifstream & is ) {
 	return is.file$ == 0p || ferror( (FILE *)(is.file$) );
 } // fail
Index: libcfa/src/fstream.hfa
===================================================================
--- libcfa/src/fstream.hfa	(revision 85d8153362477eb1dea347a576c25be02bf7fa07)
+++ libcfa/src/fstream.hfa	(revision b43151554ff02e51061ab185ce928a72bf46fbce)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 20 19:04:12 2021
-// Update Count     : 218
+// Last Modified On : Sat Apr 24 09:04:03 2021
+// Update Count     : 219
 //
 
@@ -24,5 +24,5 @@
 
 
-enum { sepSize = 16 };
+enum { ofstream_sepSize = 16 };
 struct ofstream {
 	void * file$;
@@ -33,9 +33,11 @@
 	bool sawNL$;
 	const char * sepCur$;
-	char separator$[sepSize];
-	char tupleSeparator$[sepSize];
+	char separator$[ofstream_sepSize];
+	char tupleSeparator$[ofstream_sepSize];
 	multiple_acquisition_lock lock$;
 	bool acquired$;
 }; // ofstream
+
+// Satisfies ostream
 
 // private
@@ -64,6 +66,8 @@
 void sepSetTuple( ofstream &, const char [] );
 
-void ends( ofstream & os );
-int fail( ofstream & );
+void ends( ofstream & );
+int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
+
+bool fail( ofstream & );
 int flush( ofstream & );
 void open( ofstream &, const char name[], const char mode[] );
@@ -71,18 +75,18 @@
 void close( ofstream & );
 ofstream & write( ofstream &, const char data[], size_t size );
-int fmt( ofstream &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
-void acquire( ofstream & os );
-void release( ofstream & os );
+
+void acquire( ofstream & );
+void release( ofstream & );
 
 struct osacquire {
 	ofstream & os;
 };
-void ?{}( osacquire & acq, ofstream & os );
+void ?{}( osacquire & acq, ofstream & );
 void ^?{}( osacquire & acq );
 
-void ?{}( ofstream & os );
-void ?{}( ofstream & os, const char name[], const char mode[] );
-void ?{}( ofstream & os, const char name[] );
-void ^?{}( ofstream & os );
+void ?{}( ofstream & );
+void ?{}( ofstream &, const char name[], const char mode[] );
+void ?{}( ofstream &, const char name[] );
+void ^?{}( ofstream & );
 
 extern ofstream & sout, & stdout, & serr, & stderr;		// aliases
@@ -100,4 +104,6 @@
 }; // ifstream
 
+// Satisfies istream
+
 // public
 void nlOn( ifstream & );
@@ -105,5 +111,5 @@
 bool getANL( ifstream & );
 void ends( ifstream & );
-int fail( ifstream & is );
+bool fail( ifstream & is );
 int eof( ifstream & is );
 void open( ifstream & is, const char name[], const char mode[] );
@@ -142,6 +148,6 @@
 );
 
-void ?{}( Open_Failure & this, ofstream & ostream );
-void ?{}( Open_Failure & this, ifstream & istream );
+void ?{}( Open_Failure & this, ofstream & );
+void ?{}( Open_Failure & this, ifstream & );
 
 // Local Variables: //