Changes in / [32a1d654:6ba16fa]

Location:

src/libcfa

Files:

• fstream (modified) (5 diffs)
• fstream.c (modified) (6 diffs)

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 15:17:26 2017
-// Update Count     : 130
+// Last Modified On : Thu Dec  7 08:06:11 2017
+// Update Count     : 129
 //
 
@@ -52 +52 @@
 int flush( ofstream & );
 void open( ofstream &, const char * name, const char * mode );
-void open( ofstream &, const char * name );
 void close( ofstream & );
 ofstream & write( ofstream &, const char * data, unsigned long int size );
@@ -59 +58 @@
 void ?{}( ofstream & os );
 void ?{}( ofstream & os, const char * name, const char * mode );
-void ?{}( ofstream & os, const char * name );
 
 extern ofstream & sout, & serr;
@@ -71 +69 @@
 int fail( ifstream & is );
 int eof( ifstream & is );
-void open( ifstream & is, const char * name, const char * mode );
 void open( ifstream & is, const char * name );
 void close( ifstream & is );
@@ -79 +76 @@
 
 void ?{}( ifstream & is );
-void ?{}( ifstream & is, const char * name, const char * mode );
 void ?{}( ifstream & is, const char * name );
 

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Dec  9 09:31:23 2017
-// Update Count     : 275
+// Last Modified On : Thu Dec  7 08:35:01 2017
+// Update Count     : 270
 //
 
@@ -46 +46 @@
 
 // public
-void ?{}( ofstream & os ) { os.file = 0; }
+void ?{}( ofstream & os ) {}
 
 void ?{}( ofstream & os, const char * name, const char * mode ) {
         open( os, name, mode );
-}
-void ?{}( ofstream & os, const char * name ) {
-        open( os, name, "w" );
 }
 
@@ -87 +84 @@
 
 int fail( ofstream & os ) {
-        return os.file == 0 || ferror( (FILE *)(os.file) );
+        return ferror( (FILE *)(os.file) );
 } // fail
 
@@ -96 +93 @@
 void open( ofstream & os, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
-        // if ( file == 0 ) {                                                                   // do not change unless successful
-        //      fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
-        //      perror( 0 );
-        //      exit( EXIT_FAILURE );
-        // } // if
+        if ( file == 0 ) {                                                                      // do not change unless successful
+                fprintf( stderr, IO_MSG "open output file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
+        } // if
         (os){ file, true, false, " ", ", " };
-} // open
-
-void open( ofstream & os, const char * name ) {
-        open( os, name, "w" );
 } // open
 
@@ -159 +152 @@
 
 // public
-void ?{}( ifstream & is ) {     is.file = 0; }
-
-void ?{}( ifstream & is, const char * name, const char * mode ) {
-        open( is, name, mode );
-}
+void ?{}( ifstream & is ) {}
+
 void ?{}( ifstream & is, const char * name ) {
-        open( is, name, "r" );
+        open( is, name );
 }
 
 int fail( ifstream & is ) {
-        return is.file == 0 || ferror( (FILE *)(is.file) );
+        return ferror( (FILE *)(is.file) );
 } // fail
 
@@ -176 +166 @@
 } // eof
 
-void open( ifstream & is, const char * name, const char * mode ) {
-        FILE *file = fopen( name, mode );
-        // if ( file == 0 ) {                                                                   // do not change unless successful
-        //      fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
-        //      perror( 0 );
-        //      exit( EXIT_FAILURE );
-        // } // if
+void open( ifstream & is, const char * name ) {
+        FILE *file = fopen( name, "r" );
+        if ( file == 0 ) {                                                                      // do not change unless successful
+                fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
+                perror( 0 );
+                exit( EXIT_FAILURE );
+        } // if
         is.file = file;
-} // open
-
-void open( ifstream & is, const char * name ) {
-        open( is, name, "r" );
 } // open