[master] da8ea9164 Teach a rudimentary alignment rule to vtc.typesize()

[Dridi Boukelmoune]

commit da8ea91648d9a3ef65379a49ad9c8d449c8c52d8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Nov 13 16:56:06 2019 +0100

    Teach a rudimentary alignment rule to vtc.typesize()

diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index d349e565f..9b382a6c0 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -267,14 +267,14 @@ vmod_workspace_dump(VRT_CTX, VCL_ENUM which, VCL_ENUM where,
 VCL_INT v_matchproto_(td_vtc_typesize)
 vmod_typesize(VRT_CTX, VCL_STRING s)
 {
-	size_t i = 0;
+	size_t i = 0, l, a;
 	const char *p;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 
 	for (p = s; *p; p++) {
 		switch (*p) {
-#define VTC_TYPESIZE(c, t) case c: i += sizeof(t); break;
+#define VTC_TYPESIZE(c, t) case c: l = sizeof(t); break;
 		VTC_TYPESIZE('d', double)
 		VTC_TYPESIZE('f', float)
 		VTC_TYPESIZE('i', int)
@@ -283,10 +283,15 @@ vmod_typesize(VRT_CTX, VCL_STRING s)
 		VTC_TYPESIZE('o', off_t)
 		VTC_TYPESIZE('p', void *)
 		VTC_TYPESIZE('s', short)
+		VTC_TYPESIZE('u', unsigned)
 		VTC_TYPESIZE('z', size_t)
 #undef VTC_TYPESIZE
 		default:	return (-1);
 		}
+		a = i % l;
+		if (a != 0)
+			i += (l - a);
+		i += l;
 	}
 	return ((VCL_INT)i);
 }