From 987942a206ef0f2342bf81d5de6432c6af42b7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 21 Nov 2023 09:56:26 +0100
Subject: New upstream version 4.17

---
 src/tc-memmem.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/tc-memmem.c')

diff --git a/src/tc-memmem.c b/src/tc-memmem.c
index a4f272e..1a56f1b 100644
--- a/src/tc-memmem.c
+++ b/src/tc-memmem.c
@@ -14,14 +14,14 @@ static unsigned int size = 1048576 * 64;
 static const char filler_text[] =
 	"Slhrdlu cringle tongle flonging blobbity bleep blingmangl";
 
-static void long_scan(void)
+static int long_scan(void)
 {
 	struct timespec start, stop, delta;
 	char *filler2, *p;
 
 	filler2 = malloc(size);
 	if (filler2 == NULL)
-		abort();
+		return EXIT_FAILURE;
 	memset(filler2, 'l', size);
 	filler2[size-2] = 'a';
 
@@ -32,19 +32,20 @@ static void long_scan(void)
 	HX_timespec_sub(&delta, &stop, &start);
 	printf("long_scan: " HX_TIMESPEC_FMT "\n", HX_TIMESPEC_EXP(&delta));
 	free(filler2);
+	return EXIT_SUCCESS;
 }
 
-int main(void)
+static int runner(void)
 {
 	unsigned int i;
 	char *haystack;
 	struct timespec start, stop, delta;
 
 	if (HX_init() <= 0)
-		abort();
+		return EXIT_FAILURE;
 	haystack = malloc(size);
 	if (haystack == NULL)
-		abort();
+		return EXIT_FAILURE;
 	memset(haystack, 'A', size);
 	haystack[size-1] = haystack[size-2] = 'Z';
 	printf("Init done\n");
@@ -55,8 +56,11 @@ int main(void)
 	printf("%p\n", HX_memmem(filler_text, strlen(filler_text), "ngl", 3));
 	printf("%p\n", HX_memmem(filler_text, strlen(filler_text), "ngl", 3));
 
-	long_scan();
-
+	int ret = long_scan();
+	if (ret != EXIT_SUCCESS) {
+		free(haystack);
+		return ret;
+	}
 	for (i = 0; i < 10; ++i) {
 		printf("Search length %u...", i);
 		clock_gettime(CLOCK_THREAD_CPUTIME_ID, &start);
@@ -66,6 +70,15 @@ int main(void)
 		printf(HX_TIMESPEC_FMT "\n", HX_TIMESPEC_EXP(&delta));
 	}
 
+	free(haystack);
 	HX_exit();
 	return EXIT_SUCCESS;
 }
+
+int main(void)
+{
+	int ret = runner();
+	if (ret != EXIT_FAILURE)
+		fprintf(stderr, "FAILED\n");
+	return ret;
+}
-- 
cgit v1.2.3