Changeset f80e0218 for src/libcfa/fstream.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/libcfa/fstream.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fstream.c -- 
+// fstream.c --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 17:55:27 2016
-// Update Count     : 176
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 02 15:14:52 2016
+// Update Count     : 187
 //
 
@@ -75 +75 @@
         if ( fclose( (FILE *)(os->file) ) == EOF ) {
                 perror( IO_MSG "close output" );
-        } // if 
+        } // if
 } // close
 
@@ -93 +93 @@
 int prtfmt( ofstream * os, const char fmt[], ... ) {
     va_list args;
-
     va_start( args, fmt );
     int len = vfprintf( (FILE *)(os->file), fmt, args );
@@ -103 +102 @@
         } // if
     va_end( args );
+
+        sepReset( os );                                                                         // reset separator
         return len;
 } // prtfmt
@@ -139 +140 @@
         if ( fclose( (FILE *)(is->file) ) == EOF ) {
                 perror( IO_MSG "close input" );
-        } // if 
+        } // if
 } // close
 
@@ -154 +155 @@
         return is;
 } // read
-  
+
 ifstream *ungetc( ifstream * is, char c ) {
         if ( fail( is ) ) {