From 8e747d67c7b53ba51da73ea172a5ea297edbfc52 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Tue, 23 Jun 2020 15:47:31 +0200 Subject: wähle sprechendere Namen für Feldtrenner und Feldbegrenzer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- csv.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'csv.c') diff --git a/csv.c b/csv.c index d82f531..818220c 100644 --- a/csv.c +++ b/csv.c @@ -35,8 +35,8 @@ csv_mem_free(void *ptr, size_t sz, void *cb_arg) /* === CSV-OPTIONS Interface === */ const csv_options_t csv_default_options = { - .quote_symbol = '"', - .sep_symbol = ',', + .field_delimiter = '"', + .field_separator = ',', .cb_error = NULL, .cb_allocate = csv_mem_allocate, .cb_reallocate = csv_mem_reallocate, @@ -280,8 +280,8 @@ csv_read(csv_t *csv, FILE *in) STATE_END_FILE, }; - register const int QUOTE = csv->csv_options->quote_symbol; - register const int SEP = csv->csv_options->sep_symbol; + register const int DELIM = csv->csv_options->field_delimiter; + register const int SEP = csv->csv_options->field_separator; csv_string_reset(&csv->csv_string); csv_field_reset(&csv->csv_field); @@ -310,7 +310,7 @@ csv_read(csv_t *csv, FILE *in) else if ( ch == SEP ) { state = STATE_END_FIELD; } - else if ( ch == QUOTE ) { + else if ( ch == DELIM ) { state = STATE_QUOTED_FIELD; } else { @@ -325,13 +325,13 @@ csv_read(csv_t *csv, FILE *in) if ( ch == EOF ) { state = STATE_END_FILE; } - else if ( ch == QUOTE ) { + else if ( ch == DELIM ) { ch = getc(in); if ( ch == EOF ) { state = STATE_END_FILE; } - else if ( ch == QUOTE ) { - csv_string_append(&csv->csv_string, QUOTE, csv->csv_options); + else if ( ch == DELIM ) { + csv_string_append(&csv->csv_string, DELIM, csv->csv_options); } else if ( ch == SEP ) { state = STATE_END_FIELD; @@ -347,7 +347,7 @@ csv_read(csv_t *csv, FILE *in) state = STATE_END_LINE; } else { - csv_string_append(&csv->csv_string, QUOTE, csv->csv_options); + csv_string_append(&csv->csv_string, DELIM, csv->csv_options); ungetc(ch, in); /* zuviel gelesenes Zeichen zurückstellen */ } } @@ -437,22 +437,22 @@ csv_write_field(FILE *out, const char *field, const csv_options_t * const csv_op assert(field != NULL); assert(out != NULL); - const char QUOTE = csv_options->quote_symbol; + const char DELIM = csv_options->field_delimiter; if ( *field != '\0' ) { - putc(QUOTE, out); + putc(DELIM, out); for ( ; *field != '\0'; ++field ) { - if ( *field == QUOTE ) { - putc(QUOTE, out); - putc(QUOTE, out); + if ( *field == DELIM ) { + putc(DELIM, out); + putc(DELIM, out); } else { putc(*field, out); } } - putc(QUOTE, out); + putc(DELIM, out); } } @@ -466,7 +466,7 @@ csv_write(FILE *out, int n, const char *fields[], const csv_options_t * csv_opti csv_options = &csv_default_options; } - const char SEP = csv_options->sep_symbol; + const char SEP = csv_options->field_separator; /* process first field */ if ( 0 != n && *fields != NULL ) { -- cgit v1.3