summaryrefslogtreecommitdiff
path: root/csv.c
diff options
context:
space:
mode:
authorThomas Schmucker <ts@its1.de>2020-07-02 09:12:20 +0200
committerThomas Schmucker <ts@its1.de>2020-07-02 09:12:20 +0200
commit7cf4aa222ab5cbda4bf8a6ffc968a85304cc8333 (patch)
treeb477a3d95ab215b4d8b1e3fb7876ba2df06e3f67 /csv.c
parent319e60d31b30c59868edc0bee8688ba4f40fdb80 (diff)
downloadlibcsv-7cf4aa222ab5cbda4bf8a6ffc968a85304cc8333.tar.gz
libcsv-7cf4aa222ab5cbda4bf8a6ffc968a85304cc8333.tar.bz2
libcsv-7cf4aa222ab5cbda4bf8a6ffc968a85304cc8333.zip
csv-read() sollte bei Dateiende EOF liefern, statt -1. Damit wird der
Clientcode lesbarer und verständlicher.
Diffstat (limited to 'csv.c')
-rw-r--r--csv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/csv.c b/csv.c
index 430630b..71c0e0f 100644
--- a/csv.c
+++ b/csv.c
@@ -291,13 +291,13 @@ csv_read(csv_t *csv, FILE *in)
291 291
292 if ( ferror(in) ) { 292 if ( ferror(in) ) {
293 csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options); 293 csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options);
294 return -1; 294 return EOF;
295 } 295 }
296 296
297 // do not try to read if EOF has already been seen 297 // do not try to read if EOF has already been seen
298 if ( feof(in) ) { 298 if ( feof(in) ) {
299 csv_cleanup(csv); 299 csv_cleanup(csv);
300 return -1; 300 return EOF;
301 } 301 }
302 302
303 enum { 303 enum {
@@ -429,12 +429,12 @@ csv_read(csv_t *csv, FILE *in)
429 case STATE_END_FILE: 429 case STATE_END_FILE:
430 if ( ferror(in) ) { 430 if ( ferror(in) ) {
431 csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options); 431 csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options);
432 return -1; 432 return EOF;
433 } 433 }
434 434
435 if ( csv_string_empty(&csv->csv_string) ) { 435 if ( csv_string_empty(&csv->csv_string) ) {
436 csv_cleanup(csv); 436 csv_cleanup(csv);
437 return -1; // EOF reached 437 return EOF; // EOF reached
438 } 438 }
439 439
440 /* 440 /*