Update submodule remotes

5 files changed, 7 insertions, 6 deletions

diff --git a/.gitmodules b/.gitmodules
index 3898962..ee1b0f1 100644
--- 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/lib/libdvec b/lib/libdvec
-Subproject cf90c882f738016cc306799617c367e064883c0
+Subproject d9bc4e34e3a880e31118af3b7f623d644af7025
diff --git a/lib/libhmap b/lib/libhmap
-Subproject e86177eb3072c0c755986ff4c8d4c5d0cce7213
+Subproject 274addaba036c4dafda702f4dd449ab3157565d
diff --git a/lib/libtabular b/lib/libtabular
-Subproject 466a4dcdf8adc4a08c93080e59a7c401779462d
+Subproject f518cb2853fa164b4c4d3871da464c8f54fc600
diff --git a/tabular.c b/tabular.c
index d5c30ca..c38ca3f 100644
--- 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;
 }