Cleanup: move utilities back out of libsquashfs

This commit removes the allocation helpers and string table functions
out of libsquashfs back into a "libutil.a". The problem of libsquashfs
exporting stuff that it shouldn't is resolved by retaining the internal
attributes and directly adding the source to libsquashfs instead of
trying to somehow link against libutil.la.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 0 insertions, 37 deletions

diff --git a/lib/sqfs/alloc.c b/lib/sqfs/alloc.c
deleted file mode 100644
index e8305d8..0000000
--- a/lib/sqfs/alloc.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * alloc.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-
-#include "util.h"
-
-#include <stdlib.h>
-#include <errno.h>
-
-void *alloc_flex(size_t base_size, size_t item_size, size_t nmemb)
-{
-	size_t size;
-
-	if (SZ_MUL_OV(nmemb, item_size, &size) ||
-	    SZ_ADD_OV(base_size, size, &size)) {
-		errno = EOVERFLOW;
-		return NULL;
-	}
-
-	return calloc(1, size);
-}
-
-void *alloc_array(size_t item_size, size_t nmemb)
-{
-	size_t size;
-
-	if (SZ_MUL_OV(nmemb, item_size, &size)) {
-		errno = EOVERFLOW;
-		return NULL;
-	}
-
-	return calloc(1, size);
-}