fix 139: compare files if input has duplicate column names (#165)

fix bug in colname comparison
liquidaty · Apr 12, 2024 · a084e8e · a084e8e
1 parent af4979b
commit a084e8e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/compare_unique_colname.c b/app/compare_unique_colname.c
@@ -1,6 +1,6 @@
 static int zsv_compare_unique_colname_cmp(zsv_compare_unique_colname *x, zsv_compare_unique_colname *y) {
   return x->instance_num == y->instance_num ?
-    zsv_stricmp(x->name, y->name) : x->instance_num > y->instance_num ? 1 : 0;
+    zsv_stricmp(x->name, y->name) : x->instance_num > y->instance_num ? 1 : x->instance_num < y->instance_num ? -1 : 0;
 }
 
 SGLIB_DEFINE_RBTREE_FUNCTIONS(zsv_compare_unique_colname, left, right, color, zsv_compare_unique_colname_cmp);
@@ -75,8 +75,12 @@ zsv_compare_unique_colname_add(zsv_compare_unique_colname **tree,
     _new_col =
       zsv_compare_unique_colname_add_if_not_found(tree, s, len,
                                                   instance_num, &added);
-    if(!added) // should not happen
+    if(!added) { // should not happen
+#ifndef NDEBUG
+      fprintf(stderr, "Unexpected error! %s: %i\n", __FILE__, __LINE__);
+#endif
       return zsv_compare_status_error;
+    }
   }
   *new_col = _new_col;
   return zsv_compare_status_ok;