Changes in src/libcfa/fstream.c [6152c81:0583064b]

File:

• src/libcfa/fstream.c (modified) (8 diffs)

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 14:48:09 2017
-// Update Count     : 192
+// Last Modified On : Thu Mar 23 08:20:41 2017
+// Update Count     : 226
 //
 
@@ -25 +25 @@
 #include <complex.h>                                                                    // creal, cimag
 }
+#include "assert"
 
 #define IO_MSG "I/O error: "
+
+void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+        this->file = file;
+        this->sepDefault = sepDefault;
+        this->sepOnOff = sepOnOff;
+        sepSet( this, separator );
+        sepSetCur( this, sepGet( this ) );
+        sepSetTuple( this, tupleSeparator );
+}
 
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
@@ -33 +43 @@
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
-const char * sepGet( ofstream * os ) { return &(os->separator[0]); }
+
+const char * sepGetCur( ofstream * os ) { return os->sepCur; }
+void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
+
+const char * sepGet( ofstream * os ) { return os->separator; }
 
 void sepSet( ofstream * os, const char * s ) {
-        strncpy( &(os->separator[0]), s, separateSize - 1 );
+        assert( s );
+        strncpy( os->separator, s, separateSize - 1 );
         os->separator[separateSize - 1] = '\0';
+} // sepSet
+
+const char * sepGetTuple( ofstream * os ) { return os->tupleSeparator; }
+
+void sepSetTuple( ofstream * os, const char * s ) {
+        assert( s );
+        strncpy( os->tupleSeparator, s, separateSize - 1 );
+        os->tupleSeparator[separateSize - 1] = '\0';
 } // sepSet
 
@@ -69 +92 @@
                 exit( EXIT_FAILURE );
         } // if
-        os->file = file;
-        sepOff( os );
-        sepSet( os, " " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 
@@ -95 +116 @@
 } // write
 
-int prtfmt( ofstream * os, const char fmt[], ... ) {
+int fmt( ofstream * os, const char format[], ... ) {
         va_list args;
-        va_start( args, fmt );
-        int len = vfprintf( (FILE *)(os->file), fmt, args );
+        va_start( args, format );
+        int len = vfprintf( (FILE *)(os->file), format, args );
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os->file) ) ) {
@@ -109 +130 @@
         sepReset( os );                                                                         // reset separator
         return len;
-} // prtfmt
-
-
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, { ' ', '\0' } };
+} // fmt
+
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, { ' ', '\0' } };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
 ofstream *serr = &serrFile;
 
@@ -173 +193 @@
 } // ungetc
 
-int scanfmt( ifstream * is, const char fmt[], ... ) {
+int fmt( ifstream * is, const char format[], ... ) {
         va_list args;
 
-        va_start( args, fmt );
-        int len = vfscanf( (FILE *)(is->file), fmt, args );
+        va_start( args, format );
+        int len = vfscanf( (FILE *)(is->file), format, args );
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is->file) ) ) {
@@ -186 +206 @@
         va_end( args );
         return len;
-} // prtfmt
+} // fmt