From b63e39ade1e376ad8f433a0d751eddf4826a5230 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 21 Feb 2020 12:39:28 +0100 Subject: 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 --- lib/sqfs/util.h | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 lib/sqfs/util.h (limited to 'lib/sqfs/util.h') diff --git a/lib/sqfs/util.h b/lib/sqfs/util.h deleted file mode 100644 index a379c0d..0000000 --- a/lib/sqfs/util.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: LGPL-3.0-or-later */ -/* - * util.h - * - * Copyright (C) 2019 David Oberhollenzer - */ -#ifndef SQFS_UTIL_H -#define SQFS_UTIL_H - -#include "config.h" -#include "sqfs/predef.h" -#include "compat.h" - -#include - -/* - Helper for allocating data structures with flexible array members. - - 'base_size' is the size of the struct itself, 'item_size' the size of a - single array element and 'nmemb' the number of elements. - - Iternally checks for arithmetic overflows when allocating the combined thing. - */ -SQFS_INTERNAL -void *alloc_flex(size_t base_size, size_t item_size, size_t nmemb); - -/* Basically the same as calloc, but *ALWAYS* does overflow checking */ -SQFS_INTERNAL -void *alloc_array(size_t item_size, size_t nmemb); - -#endif /* SQFS_UTIL_H */ -- cgit v1.2.3