Changes in libcfa/src/fstream.cfa [ff2a33e:65240bb]

File:

• libcfa/src/fstream.cfa (modified) (10 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 14 11:51:10 2019
-// Update Count     : 347
+// Last Modified On : Fri Jul 12 12:03:53 2019
+// Update Count     : 344
 //
 
@@ -119 +119 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
+                abort( IO_MSG "open output file \"%s\", %s", name, strerror( errno ) );
         } // if
         #endif // __CFA_DEBUG__
@@ -133 +133 @@
 
         if ( fclose( (FILE *)(os.file) ) == EOF ) {
-                abort | IO_MSG "close output" | nl | strerror( errno );
+                abort( IO_MSG "close output %s", strerror( errno ) );
         } // if
 } // close
@@ -139 +139 @@
 ofstream & write( ofstream & os, const char * data, size_t size ) {
         if ( fail( os ) ) {
-                abort | IO_MSG "attempt write I/O on failed stream";
+                abort( "attempt write I/O on failed stream\n" );
         } // if
 
         if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
-                abort | IO_MSG "write" | nl | strerror( errno );
+                abort( IO_MSG "write %s", strerror( errno ) );
         } // if
         return os;
@@ -154 +154 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os.file) ) ) {
-                        abort | IO_MSG "invalid write";
+                        abort( "invalid write\n" );
                 } // if
         } // if
@@ -211 +211 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
+                abort( IO_MSG "open input file \"%s\", %s\n", name, strerror( errno ) );
         } // if
         #endif // __CFA_DEBUG__
@@ -225 +225 @@
 
         if ( fclose( (FILE *)(is.file) ) == EOF ) {
-                abort | IO_MSG "close input" | nl | strerror( errno );
+                abort( IO_MSG "close input %s", strerror( errno ) );
         } // if
 } // close
@@ -231 +231 @@
 ifstream & read( ifstream & is, char * data, size_t size ) {
         if ( fail( is ) ) {
-                abort | IO_MSG "attempt read I/O on failed stream";
+                abort( "attempt read I/O on failed stream\n" );
         } // if
 
         if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
-                abort | IO_MSG "read" | nl | strerror( errno );
+                abort( IO_MSG "read %s", strerror( errno ) );
         } // if
         return is;
@@ -242 +242 @@
 ifstream &ungetc( ifstream & is, char c ) {
         if ( fail( is ) ) {
-                abort | IO_MSG "attempt ungetc I/O on failed stream";
+                abort( "attempt ungetc I/O on failed stream\n" );
         } // if
 
         if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
-                abort | IO_MSG "ungetc" | nl | strerror( errno );
+                abort( IO_MSG "ungetc %s", strerror( errno ) );
         } // if
         return is;
@@ -258 +258 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is.file) ) ) {
-                        abort | IO_MSG "invalid read";
+                        abort( "invalid read\n" );
                 } // if
         } // if