tabular

commit eff49100e4fca394a23973abd5001a4fde15d6e8
parent 446c7a8998749b9ff993bd418c4df482f5553a68
Author: Louis Burda <quent.burda@gmail.com>
Date:   Sun, 12 Nov 2023 19:46:21 +0100

Update submodule remotes

Diffstat:
M
.gitmodules
 | 
8
++++----
M
tabular.c
 | 
5
+++--

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "lib/libtabular"]
 	path = lib/libtabular
-	url = git@sinitax.com:sinitax/libtabular
+	url = git@sinitax.com:sinitax/libtabular-c
 [submodule "lib/libdvec"]
 	path = lib/libdvec
-	url = git@sinitax.com:sinitax/libdvec
+	url = git@sinitax.com:sinitax/libdvec-c
 [submodule "lib/libhmap"]
 	path = lib/libhmap
-	url = git@sinitax.com:sinitax/libhmap
+	url = git@sinitax.com:sinitax/libhmap-c
 [submodule "lib/liballoc"]
 	path = lib/liballoc
-	url = git@sinitax.com:sinitax/liballoc
+	url = git@sinitax.com:sinitax/liballoc-c
diff --git a/tabular.c b/tabular.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #define ARRLEN(x) (sizeof(x)/sizeof(*(x)))
 
@@ -117,7 +118,7 @@ print_style(FILE *file, const struct tabular_cfg *cfg,
 static bool
 read_line(void)
 {
-	void *tok, *sep, *end, *line_end;
+	uint8_t *tok, *sep, *end, *line_end;
 	ssize_t n;
 
 	if (input_done) return false;
@@ -457,7 +458,7 @@ skip:
 		memcpy(tcol, &col->tabular, sizeof(struct tabular_col));
 		tcol->user.ptr = col;
 	}
-	cfg.columns = cols.data;
+	cfg.columns = dvec_front(&cols);
 	cfg.column_count = cols.len;
 }