Changeset c84dd61 for libcfa/src/fstream.cfa

Timestamp:

Jun 21, 2023, 2:38:55 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

92355883

Parents:

0b0a285 (diff), 2de175ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/fstream.cfa (modified) (3 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 : Mon Jun  5 22:00:23 2023
-// Update Count     : 518
+// Last Modified On : Sat Jun 17 08:51:12 2023
+// Update Count     : 528
 //
 
@@ -169 +169 @@
           if ( cnt == 9 ) abort( "ofstream fmt EINTR spinning exceeded" );
     } // for
-        if ( len == EOF ) {
-                if ( ferror( (FILE *)(os.file$) ) ) {
-                        abort | IO_MSG "invalid write";
-                } // if
+        if ( len == EOF ) {                                                                     // error writing ?
+                abort | IO_MSG "invalid write";
         } // if
         va_end( args );
@@ -302 +300 @@
           if ( len != EOF || errno != EINTR ) break;            // timer interrupt ?
     } // for
-        if ( len == EOF ) {
-                if ( ferror( (FILE *)(is.file$) ) ) {
+        if ( len == EOF ) {                                                                     // EOF or matching failure ?
+                if ( ! feof( (FILE *)(is.file$) ) && ferror( (FILE *)(is.file$) ) ) {
                         abort | IO_MSG "invalid read";
                 } // if