minor clean up

liquidaty · Jan 1, 2022 · c4413b3 · c4413b3
1 parent b6d6fc3
commit c4413b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ THIS_MAKEFILE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 THIS_DIR:=$(shell basename "${THIS_MAKEFILE_DIR}")
 THIS_MAKEFILE:=$(lastword $(MAKEFILE_LIST))
 
-CONFIGFILE=config.mk
+CONFIGFILE ?= config.mk
 include ${CONFIGFILE}
 
 CONFIGFILEPATH=$(shell ls ${CONFIGFILE} >/dev/null 2>/dev/null && realpath ${CONFIGFILE})

diff --git a/app/desc.c b/app/desc.c
@@ -588,7 +588,6 @@ int MAIN(int argc, const char *argv[]) {
           data.max_cols = atoi(argv[arg_i]);
       }
       else {
-        int err = 0;
         if(data.opts.stream) {
           err = 1;
           fprintf(stderr, "Input file specified twice, or unrecognized argument: %s\n", argv[arg_i]);

diff --git a/include/zsv/utils/arg.h b/include/zsv/utils/arg.h
@@ -49,10 +49,10 @@ int zsv_args_to_opts(int argc, const char *argv[],
                      );
 
 #define INIT_DEFAULT_ARGS() do {                                \
-    struct zsv_opts opts;                                       \
-    int err = zsv_args_to_opts(argc, argv, &argc, argv, &opts); \
+    struct zsv_opts otmp;                                       \
+    int err = zsv_args_to_opts(argc, argv, &argc, argv, &otmp); \
     if(err) return err;                                         \
-    else zsv_set_default_opts(opts);                            \
+    else zsv_set_default_opts(otmp);                            \
   } while(0)
 
 #ifdef ZSV_CLI