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 4edacec588d03d445c57371991329dc93ccac345..546e973ef2887404e648822f184fdd81571bfc69 100644 (file)
--- 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 f6519cd96afa09091f6da55e591175ec4b9735d1..b7876d48ff4dc38a6097452321399b0f388f2f88 100644 (file)
--- 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 ea5a1360f62f858087eec72ad57fadd725f55f36..17b007b9dd9428f8b7e0d576c80a1057972d8340 100644 (file)
--- 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;