Changes in src/libcfa/fstream.c [0583064b:9ebd778]

File:

• src/libcfa/fstream.c (modified) (3 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 : Thu Mar 23 08:20:41 2017
-// Update Count     : 226
+// Last Modified On : Mon May 15 18:11:11 2017
+// Update Count     : 234
 //
 
@@ -38 +38 @@
 }
 
+// private
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
+void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
+void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
+const char * sepGetCur( ofstream * os ) { return os->sepCur; }
+void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
+
+// public
 void sepOn( ofstream * os ) { os->sepOnOff = 1; }
 void sepOff( ofstream * os ) { os->sepOnOff = 0; }
-void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
-void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
-
-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 ) {
-        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
 
 _Bool sepDisable( ofstream *os ) {
@@ -73 +59 @@
         _Bool temp = os->sepDefault;
         os->sepDefault = true;
-        sepReset( os );
+        if ( os->sepOnOff ) sepReset( os );                                     // start of line ?
         return temp;
 } // sepEnable
+
+const char * sepGet( ofstream * os ) { return os->separator; }
+void sepSet( ofstream * os, const char * s ) {
+        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
 
 int fail( ofstream * os ) {