libpakfire: Drop pakfire_malloc

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

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 2ebf1add2a1aa5c55ea6296d95961ddca3e7469f..f6519cd96afa09091f6da55e591175ec4b9735d1 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -30,7 +30,7 @@
 
 void pakfire_oom(size_t num, size_t len);
 
-void* pakfire_malloc(size_t len);
+void* malloc(size_t len);
 void* pakfire_realloc(void* ptr, size_t size);
 
 char* pakfire_strdup(const char* s);

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index ae429da920404f67519076a7f3d4ec21e6abf612..df033c9fa684884c0d8be3003e541653aed6fc6e 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -237,7 +237,7 @@ PAKFIRE_EXPORT char* pakfire_package_join_evr(const char* e, const char* v, cons
                l += strlen(e);
        }
 
-       char* buffer = pakfire_malloc(l + 1);
+       char* buffer = malloc(l + 1);
        if (e)
                snprintf(buffer, l + 1, "%s:%s-%s", e, v, r);
        else

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 645079f93a62bcafe6d6db0f02e365f366c2f30c..66cfd4a28c336132eb639f8276619bea686da6b8 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -302,7 +302,7 @@ PAKFIRE_EXPORT const char** pakfire_get_installonly(Pakfire pakfire) {
        Queue q;
        queue_init_clone(&q, &pakfire->installonly);
 
-       const char** installonly = pakfire_malloc(sizeof(const char*) * (q.count + 1));
+       const char** installonly = malloc(sizeof(const char*) * (q.count + 1));
 
        int i = 0;
        while (q.count) {

diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index d7288c22e15c8d52635d20ce7614494075f9f5cb..755968c6419b83bf4a4bc4ed31ae64fd3801767e 100644 (file)
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -281,7 +281,7 @@ static struct pakfire_parser_declaration* pakfire_parser_find_declaration(
        char* n = pakfire_strdup(parser->namespace);
 
        size_t length = ((n) ? strlen(n) : 0) + strlen(name) + 1;
-       char* buffer = pakfire_malloc(length + 1);
+       char* buffer = malloc(length + 1);
 
        struct pakfire_parser_declaration* d = NULL;
 
@@ -365,7 +365,7 @@ PAKFIRE_EXPORT char* pakfire_parser_expand(PakfireParser parser, const char* val
                off_t start = groups[1].rm_so, end = groups[1].rm_eo;
 
                // Get the name of the variable
-               char* variable = pakfire_malloc(end - start + 1);
+               char* variable = malloc(end - start + 1);
                snprintf(variable, end - start + 1, "%s", buffer + start);
 
                DEBUG(parser->pakfire, "Expanding variable: %s\n", variable);
@@ -391,7 +391,7 @@ PAKFIRE_EXPORT char* pakfire_parser_expand(PakfireParser parser, const char* val
                // Length of the new buffer
                size_t length = strlen(buffer) - (end - start) + ((value) ? strlen(value) : 0);
 
-               char* b = pakfire_malloc(length + 1);
+               char* b = malloc(length + 1);
 
                // Copy buffer up to the beginning of the match
                snprintf(b, start + 1, "%s", buffer);

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index a440df170a917edd115deb4484251c573425b09d..ea5a1360f62f858087eec72ad57fadd725f55f36 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_malloc(size_t len) {
-       void* r = malloc(len ? len : 1);
-       if (!r)
-               pakfire_oom(0, len);
-
-       return r;
-}
-
 void* pakfire_realloc(void* ptr, size_t size) {
        ptr = realloc(ptr, size);
        if (!ptr)
@@ -296,7 +288,7 @@ PAKFIRE_EXPORT int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t*
                return r;
 
        // Allocate buffer
-       *buffer = pakfire_malloc((sizeof(**buffer) * *len) + 1);
+       *buffer = malloc((sizeof(**buffer) * *len) + 1);
        if (!*buffer)
                return -ENOMEM;
 
@@ -341,7 +333,7 @@ PAKFIRE_EXPORT char** pakfire_split_string(const char* s, char delim) {
        }
 
        // Allocate an array of sufficient size
-       char** ret = pakfire_malloc(sizeof(*ret) * (count + 1));
+       char** ret = malloc(sizeof(*ret) * (count + 1));
 
        // Copy strings to heap one by one
        unsigned int i = 0;
@@ -372,7 +364,7 @@ PAKFIRE_EXPORT void pakfire_partition_string(const char* s, const char* delim, c
        // Length of string before delim
        size_t l = p - s;
 
-       *s1 = pakfire_malloc(l);
+       *s1 = malloc(l);
        snprintf(*s1, l, "%s", s);
 
        *s2 = pakfire_strdup(p + strlen(delim));