From 84c9a6c9664b4e9e14af89042977eb9114e1282a Mon Sep 17 00:00:00 2001
From: Guillaume Quintard <guillaume.quintard@varnish-software.com>
Date: Tue, 25 Jun 2024 20:01:09 +0200
Subject: [PATCH] no VUT_Usage in plus

---
 main.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 6db0f91..7b5962c 100644
--- a/main.c
+++ b/main.c
@@ -219,7 +219,11 @@ static int process_group(struct VSL_data *vsl,
 			switch (tag) {
 			case SLT_Begin:
 				VSB_clear(vsb);
-				VSB_printf(vsb, "%ld", t->vxid);
+#ifdef VARNISH_PLUS
+				VSB_printf(vsb, "%u", t->vxid);
+#else
+				VSB_printf(vsb, "%lu", t->vxid);
+#endif
 				VSB_finish(vsb);
 				cJSON_AddStringToObject(transaction, "id", VSB_data(vsb));
 				break;
@@ -495,6 +499,21 @@ static int process_group(struct VSL_data *vsl,
 	return (0);
 }
 
+#ifdef VARNISH_PLUS
+static void v_noreturn_
+usage(int status)
+{
+	const char **opt;
+	fprintf(stderr, "Usage: %s <options>\n\n", vut->progname);
+	fprintf(stderr, "Options:\n");
+	for (opt = vopt_spec.vopt_usage; *opt != NULL; opt += 2)
+		fprintf(stderr, " %-25s %s\n", *opt, *(opt + 1));
+	exit(status);
+}
+
+#define VUT_Usage(a, b, ret) usage(ret)
+#endif
+
 int main(int argc, char **argv)
 {
 	int opt;