diff options
| author | Thomas Schmucker <ts@its1.de> | 2020-06-19 11:11:39 +0200 |
|---|---|---|
| committer | Thomas Schmucker <ts@its1.de> | 2020-06-19 11:11:39 +0200 |
| commit | 08909bd2ef53a6110fa2210fefa6d94647f5520f (patch) | |
| tree | 15e9d25d50d378376945321db3b2772ae9ca8932 /csv.c | |
| parent | b3d12c0a9d075baae55c9922e82eb6af173e788b (diff) | |
| download | libcsv-08909bd2ef53a6110fa2210fefa6d94647f5520f.tar.gz libcsv-08909bd2ef53a6110fa2210fefa6d94647f5520f.tar.bz2 libcsv-08909bd2ef53a6110fa2210fefa6d94647f5520f.zip | |
csv_free() Funktion gegen csv_cleanup() ersetzt, die bei EOF jetzt auch automatisch aufgreufen wird.
Diffstat (limited to 'csv.c')
| -rw-r--r-- | csv.c | 4 |
1 files changed, 3 insertions, 1 deletions
| @@ -219,7 +219,7 @@ csv_init_opt(csv_t *csv, const csv_options_t * const csv_options) | |||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | void | 221 | void |
| 222 | csv_free(csv_t *csv) | 222 | csv_cleanup(csv_t *csv) |
| 223 | { | 223 | { |
| 224 | assert(csv != NULL); | 224 | assert(csv != NULL); |
| 225 | 225 | ||
| @@ -259,6 +259,7 @@ csv_read(csv_t *csv, FILE *in) | |||
| 259 | 259 | ||
| 260 | /* do not try to read if EOF has already been seen */ | 260 | /* do not try to read if EOF has already been seen */ |
| 261 | if ( feof(in) ) { | 261 | if ( feof(in) ) { |
| 262 | csv_cleanup(csv); | ||
| 262 | return -1; | 263 | return -1; |
| 263 | } | 264 | } |
| 264 | 265 | ||
| @@ -392,6 +393,7 @@ csv_read(csv_t *csv, FILE *in) | |||
| 392 | } | 393 | } |
| 393 | 394 | ||
| 394 | if ( csv_string_empty(&csv->csv_string) ) { | 395 | if ( csv_string_empty(&csv->csv_string) ) { |
| 396 | csv_cleanup(csv); | ||
| 395 | return -1; /* EOF reached */ | 397 | return -1; /* EOF reached */ |
| 396 | } | 398 | } |
| 397 | 399 | ||
