From 4f23f3d2b3137ca369c5e27f833a13e329431505 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Fri, 19 Jun 2020 11:48:31 +0200 Subject: Vereinfache das Interface noch weiter... --- csv-test.c | 5 ++--- csv.c | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/csv-test.c b/csv-test.c index b2d210a..15d868c 100644 --- a/csv-test.c +++ b/csv-test.c @@ -10,10 +10,9 @@ static int test(FILE *f) { int line = 0; - csv_t csv[1]; + csv_t csv = { 0 }; - csv_init(csv); - for ( int n; (n = csv_read(csv, f)) != -1; ) { + while ( csv_read(&csv, f) != -1 ) { ++line; } diff --git a/csv.c b/csv.c index 52e9bfd..1456d6e 100644 --- a/csv.c +++ b/csv.c @@ -257,6 +257,11 @@ csv_read(csv_t *csv, FILE *in) assert(csv != NULL); assert(in != NULL); + /* initialze if needed... */ + if ( csv->csv_options == NULL ) { + csv_init(csv); + } + /* do not try to read if EOF has already been seen */ if ( feof(in) ) { csv_cleanup(csv); -- cgit v1.3