Update csv.h/test.c w/updated fread_csv_line args

semitrivial · Dec 9, 2016 · 26752df · 26752df
1 parent 1785877
commit 26752df
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/csv.h b/csv.h
@@ -7,6 +7,6 @@
 char **parse_csv( const char *line );
 void free_csv_line( char **parsed );
 char **split_on_unescaped_newlines(const char *txt);
-char *fread_csv_line(FILE *fp, int max_line_size, int *err);
+char *fread_csv_line(FILE *fp, int max_line_size, int *done, int *err);
 
 #endif
diff --git a/tests/test.c b/tests/test.c
@@ -81,33 +81,37 @@ int test_split_on_unescaped_newlines(void) {
 }
 
 int test_fread_csv_line(void) {
+  int err, done = 0;
   FILE *fp = fopen("tests/test.csv", "r");
 
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,bar,baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,bar,baz" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,\"bar\",baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,\"bar\",baz" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,\"b\"\"ar\",baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,\"b\"\"ar\",baz" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,\"b\na\nr\",baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,\"b\na\nr\",baz" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,\"\n\nb\n\n\"\"a\"\"\n\nr\n\n\",baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,\"\n\nb\n\n\"\"a\"\"\n\nr\n\n\",baz" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,bar,\"baz\"" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,bar,\"baz\"" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,bar,\"\"baz\"\"" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,bar,\"\"baz\"\"" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,bar,\"\"\"baz\"\"\"" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,bar,\"\"\"baz\"\"\"" ) || done ) {
     return 0;
   }
-  if ( strcmp( fread_csv_line(fp, 1024, NULL), "foo,bar,baz" ) ) {
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "foo,bar,baz" ) || done ) {
+    return 0;
+  }
+  if ( strcmp( fread_csv_line(fp, 1024, &done, &err), "" ) || !done ) {
     return 0;
   }
   return 1;