Changeset 873ffb7 for src/libcfa


Ignore:
Timestamp:
Jul 16, 2016, 9:19:33 AM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:
20340c2, 7a2c5391
Parents:
cb2e8ce (diff), 5d125e4 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/fstream.c

    rcb2e8ce r873ffb7  
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 27 17:56:53 2015
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Mon May 02 15:14:52 2016
    13 // Update Count     : 187
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Fri Jul 15 13:35:29 2016
     13// Update Count     : 188
    1414//
    1515
     
    9292
    9393int prtfmt( ofstream * os, const char fmt[], ... ) {
    94     va_list args;
    95     va_start( args, fmt );
    96     int len = vfprintf( (FILE *)(os->file), fmt, args );
     94        va_list args;
     95        va_start( args, fmt );
     96        int len = vfprintf( (FILE *)(os->file), fmt, args );
    9797        if ( len == EOF ) {
    9898                if ( ferror( (FILE *)(os->file) ) ) {
     
    101101                } // if
    102102        } // if
    103     va_end( args );
     103        va_end( args );
    104104
    105105        sepReset( os );                                                                         // reset separator
     
    170170
    171171int scanfmt( ifstream * is, const char fmt[], ... ) {
    172     va_list args;
     172        va_list args;
    173173
    174     va_start( args, fmt );
    175     int len = vfscanf( (FILE *)(is->file), fmt, args );
     174        va_start( args, fmt );
     175        int len = vfscanf( (FILE *)(is->file), fmt, args );
    176176        if ( len == EOF ) {
    177177                if ( ferror( (FILE *)(is->file) ) ) {
     
    180180                } // if
    181181        } // if
    182     va_end( args );
     182        va_end( args );
    183183        return len;
    184184} // prtfmt
Note: See TracChangeset for help on using the changeset viewer.