From 05e33fb46c233f063e36eb9664ccc5553a4ae1af Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Sat, 13 Jun 2020 17:10:58 +0200
Subject: zst => state, ZST_ => STATE_

---
 csv-test.c | 64 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'csv-test.c')

diff --git a/csv-test.c b/csv-test.c
index d1ff79e..9b99a36 100644
--- a/csv-test.c
+++ b/csv-test.c
@@ -163,12 +163,12 @@ int
 csv_read(csv_t *csv, FILE *in)
 {
 	enum {
-		ZST_START_FIELD,
-		ZST_QUOTED_FIELD,
-		ZST_SIMPLE_FIELD,
-		ZST_END_FIELD,
-		ZST_END_LINE,
-		ZST_END_FILE,
+		STATE_START_FIELD,
+		STATE_QUOTED_FIELD,
+		STATE_SIMPLE_FIELD,
+		STATE_END_FIELD,
+		STATE_END_LINE,
+		STATE_END_FILE,
 	};
 
 	register const int QUOTE = csv->csv_options->quote_symbol;
@@ -177,65 +177,65 @@ csv_read(csv_t *csv, FILE *in)
 	csv_string_reset(&csv->csv_string);
 	csv_field_reset(&csv->csv_field);
 
-	for ( int zst = ZST_START_FIELD; ; ) {
+	for ( int state = STATE_START_FIELD; ; ) {
 		int ch;
 
-		switch ( zst ) {
-		case ZST_START_FIELD:
+		switch ( state ) {
+		case STATE_START_FIELD:
 			csv_field_append(&csv->csv_field, csv->csv_string.pos);
 
 			ch = getc(in);
 			if ( ch == EOF ) {
-				zst = ZST_END_FILE;
+				state = STATE_END_FILE;
 			}
 			else if ( ch == '\r' ) {	/* Teste auf CR.. */
 				ch = getc(in);
 				if ( ch != '\n' ) {		/* ... LF */
 					ungetc(ch, in);
 				}
-				zst = ZST_END_LINE;
+				state = STATE_END_LINE;
 			}
 			else if ( ch == '\n' ) {
-				zst = ZST_END_LINE;
+				state = STATE_END_LINE;
 			}
 			else if ( ch == SEP ) {
-				zst = ZST_END_FIELD;
+				state = STATE_END_FIELD;
 			}
 			else if ( ch == QUOTE ) {
-				zst = ZST_QUOTED_FIELD;
+				state = STATE_QUOTED_FIELD;
 			}
 			else {
 				csv_string_append(&csv->csv_string, ch);
-				zst = ZST_SIMPLE_FIELD;
+				state = STATE_SIMPLE_FIELD;
 			}
 			break;
 
-		case ZST_QUOTED_FIELD:
+		case STATE_QUOTED_FIELD:
 			do {
 				ch = getc(in);
 				if ( ch == EOF ) {
-					zst = ZST_END_FILE;
+					state = STATE_END_FILE;
 				}
 				else if ( ch == QUOTE ) {
 					ch = getc(in);
 					if ( ch == EOF ) {
-						zst = ZST_END_FILE;
+						state = STATE_END_FILE;
 					}
 					else if ( ch == QUOTE ) {
 						csv_string_append(&csv->csv_string, QUOTE);
 					}
 					else if ( ch == SEP ) {
-						zst = ZST_END_FIELD;
+						state = STATE_END_FIELD;
 					}
 					else if ( ch == '\r' ) {
 						ch = getc(in);
 						if ( ch != '\n' ) {
 							ungetc(ch, in);
 						}
-						zst = ZST_END_LINE;
+						state = STATE_END_LINE;
 					}
 					else if ( ch == '\n' ) {
-						zst = ZST_END_LINE;
+						state = STATE_END_LINE;
 					}
 					else {
 						csv_string_append(&csv->csv_string, QUOTE);
@@ -245,44 +245,44 @@ csv_read(csv_t *csv, FILE *in)
 				else {
 					csv_string_append(&csv->csv_string, ch);
 				}
-			} while ( zst == ZST_QUOTED_FIELD );
+			} while ( state == STATE_QUOTED_FIELD );
 			break;
 
-		case ZST_SIMPLE_FIELD:
+		case STATE_SIMPLE_FIELD:
 			do {
 				ch = getc(in);
 				if ( ch == EOF ) {
-					zst = ZST_END_FILE;
+					state = STATE_END_FILE;
 				}
 				else if ( ch == SEP ) {
-					zst = ZST_END_FIELD;
+					state = STATE_END_FIELD;
 				}
 				else if ( ch == '\r' ) {
 					ch = getc(in);
 					if ( ch != '\n' ) {
 						ungetc(ch, in);
 					}
-					zst = ZST_END_LINE;
+					state = STATE_END_LINE;
 				}
 				else if ( ch == '\n' ) {
-					zst = ZST_END_LINE;
+					state = STATE_END_LINE;
 				}
 				else {
 					csv_string_append(&csv->csv_string, ch);
 				}
-			} while ( zst == ZST_SIMPLE_FIELD );
+			} while ( state == STATE_SIMPLE_FIELD );
 			break;
 
-		case ZST_END_FIELD:
+		case STATE_END_FIELD:
 			csv_string_append(&csv->csv_string, '\0');
-			zst = ZST_START_FIELD;
+			state = STATE_START_FIELD;
 			break;
 
-		case ZST_END_LINE:
+		case STATE_END_LINE:
 			csv_string_append(&csv->csv_string, '\0');
 			return csv->csv_field.pos;
 
-		case ZST_END_FILE:
+		case STATE_END_FILE:
 			if ( csv_string_empty(&csv->csv_string) ) {
 				return -1;	/* EOF reached */
 			}
-- 
cgit v1.3