Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/fstream.c

    r53a6c2a r9ebd778  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jul  6 18:38:25 2017
    13 // Update Count     : 251
     12// Last Modified On : Mon May 15 18:11:11 2017
     13// Update Count     : 234
    1414//
    1515
     
    3939
    4040// private
    41 _Bool sepPrt( ofstream * os ) { setNL( os, false ); return os->sepOnOff; }
     41_Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
    4242void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
    4343void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
    4444const char * sepGetCur( ofstream * os ) { return os->sepCur; }
    4545void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
    46 _Bool getNL( ofstream * os ) { return os->sawNL; }
    47 void setNL( ofstream * os, _Bool state ) { os->sawNL = state; }
    4846
    4947// public
    50 void sepOn( ofstream * os ) { os->sepOnOff = ! getNL( os ); }
    51 void sepOff( ofstream * os ) { os->sepOnOff = false; }
     48void sepOn( ofstream * os ) { os->sepOnOff = 1; }
     49void sepOff( ofstream * os ) { os->sepOnOff = 0; }
    5250
    5351_Bool sepDisable( ofstream *os ) {
     
    6866void sepSet( ofstream * os, const char * s ) {
    6967        assert( s );
    70         strncpy( os->separator, s, sepSize - 1 );
    71         os->separator[sepSize - 1] = '\0';
     68        strncpy( os->separator, s, separateSize - 1 );
     69        os->separator[separateSize - 1] = '\0';
    7270} // sepSet
    7371
     
    7573void sepSetTuple( ofstream * os, const char * s ) {
    7674        assert( s );
    77         strncpy( os->tupleSeparator, s, sepSize - 1 );
    78         os->tupleSeparator[sepSize - 1] = '\0';
     75        strncpy( os->tupleSeparator, s, separateSize - 1 );
     76        os->tupleSeparator[separateSize - 1] = '\0';
    7977} // sepSet
    8078
     
    9492                exit( EXIT_FAILURE );
    9593        } // if
    96         ?{}( os, file, true, false, " ", ", " );
     94        ?{}( os, file, 1, 0, " ", ", " );
    9795} // open
    9896
     
    134132} // fmt
    135133
    136 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
     134static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
    137135ofstream *sout = &soutFile;
    138 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
     136static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
    139137ofstream *serr = &serrFile;
    140138
     
    152150
    153151void open( ifstream * is, const char * name, const char * mode ) {
    154         FILE *file = fopen( name, mode );
    155         if ( file == 0 ) {                                                                      // do not change unless successful
     152        FILE *t = fopen( name, mode );
     153        if ( t == 0 ) {                                                                         // do not change unless successful
    156154                fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
    157155                perror( 0 );
    158156                exit( EXIT_FAILURE );
    159157        } // if
    160         is->file = file;
     158        is->file = t;
    161159} // open
    162160
Note: See TracChangeset for help on using the changeset viewer.