cleanup

cktan · Jan 20, 2022 · c9e71bc · c9e71bc
1 parent 0b8b203
commit c9e71bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,16 @@
-CC = gcc
+CC = gcc-11
 CFILES = csv.c
 EXEC = csv2py csvsplit csvnorm csvstat csvecho
 
-CFLAGS += -std=c99 -Wall -Wextra -mavx
+CFLAGS += -std=c99 -Wall -Wextra -mavx2 -mfma -mbmi
 
 # to compile for debug: make DEBUG=1
 # to compile for no debug: make
 ifdef DEBUG
     CFLAGS += -O0 -g
 else
     # NOTE: on gcc 6, csvstat produced by -O2 runs faster than -O3
-    CFLAGS += -O2 -DNDEBUG
+    CFLAGS += -O3 -DNDEBUG
 endif
 
 LIB = libcsv.a

diff --git a/csvecho.c b/csvecho.c
@@ -13,7 +13,9 @@ int main(int argc, char **argv) {
 
   char **field;
   int nfield;
-  csv_parse_t *cp = csv_open('\"', '\\', '|', "");
+  char nullstr[20];
+  nullstr[0] = 0;;
+  csv_parse_t *cp = csv_open('\"', '\\', '|', nullstr);
 
   int n = csv_feed_last(cp, line, strlen(line), &field, &nfield);
   if (n == -1) {

diff --git a/csvsplit.c b/csvsplit.c
@@ -73,7 +73,9 @@ static void prow(char *ptr, int len) {
 }
 
 void do_split(FILE *fp) {
-  csv_parse_t *cp = csv_open('"', '"', ',', "");
+  char nullstr[20];
+  nullstr[0] = 0;
+  csv_parse_t *cp = csv_open('"', '"', ',', nullstr);
   if (!cp) {
     fatal("csv_open failed");
   }