From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Feb 2021 20:41:17 +0000 (+0000)
Subject: libpakfire: Drop pakfire_realloc
X-Git-Tag: 0.9.28~1285^2~779
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5538145685822bb2fd33112b9c553f4c0ba997c;p=pakfire.git

libpakfire: Drop pakfire_realloc

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 4edacec58..546e973ef 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -133,7 +133,7 @@ static int archive_read(struct archive* a, void** data, size_t* data_size) {
 	*data_size = 0;
 
 	for (;;) {
-		*data = pakfire_realloc(*data, *data_size + BLOCKSIZE);
+		*data = realloc(*data, *data_size + BLOCKSIZE);
 
 		ssize_t size = archive_read_data(a, *data + *data_size, BLOCKSIZE);
 		if (size == 0)
@@ -945,7 +945,7 @@ static int pakfire_archive_parse_entry_signature(PakfireArchive archive,
 		size_t num_signatures = _pakfire_archive_count_signatures(archive->signatures) + 1;
 
 		// Resize the array
-		archive->signatures = pakfire_realloc(archive->signatures, sizeof(*archive->signatures) * num_signatures);
+		archive->signatures = realloc(archive->signatures, sizeof(*archive->signatures) * num_signatures);
 	} else {
 		archive->signatures = calloc(2, sizeof(*archive->signatures));
 	}
diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index f6519cd96..b7876d48f 100644
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -30,9 +30,6 @@
 
 void pakfire_oom(size_t num, size_t len);
 
-void* malloc(size_t len);
-void* pakfire_realloc(void* ptr, size_t size);
-
 char* pakfire_strdup(const char* s);
 int pakfire_string_startswith(const char* s, const char* prefix);
 
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index ea5a1360f..17b007b9d 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -45,14 +45,6 @@ void pakfire_oom(size_t num, size_t len) {
 	exit(1);
 }
 
-void* pakfire_realloc(void* ptr, size_t size) {
-	ptr = realloc(ptr, size);
-	if (!ptr)
-		pakfire_oom(0, size);
-
-	return ptr;
-}
-
 char* pakfire_strdup(const char* s) {
 	if (!s)
 		return 0;