From 7cf4aa222ab5cbda4bf8a6ffc968a85304cc8333 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Thu, 2 Jul 2020 09:12:20 +0200 Subject: csv-read() sollte bei Dateiende EOF liefern, statt -1. Damit wird der Clientcode lesbarer und verständlicher. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- csv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'csv.c') 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) if ( ferror(in) ) { csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options); - return -1; + return EOF; } // do not try to read if EOF has already been seen if ( feof(in) ) { csv_cleanup(csv); - return -1; + return EOF; } enum { @@ -429,12 +429,12 @@ csv_read(csv_t *csv, FILE *in) case STATE_END_FILE: if ( ferror(in) ) { csv_fatal_error(CSV_ERR_IO_READ, csv->csv_options); - return -1; + return EOF; } if ( csv_string_empty(&csv->csv_string) ) { csv_cleanup(csv); - return -1; // EOF reached + return EOF; // EOF reached } /* -- cgit v1.3