Changeset dc5c303 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2023-12-28T13:59:23Z (22 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/lib/c/generic/malloc.c (modified) (3 diffs)

uspace/lib/c/generic/malloc.c

@@ -34 +34 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdalign.h>
 #include <stdbool.h>
@@ -47 +47 @@
 #include <stdlib.h>
 #include <adt/gcdlcm.h>
+#include <malloc.h>
 
 #include "private/malloc.h"
@@ -773 +774 @@
 }
 
-/** Allocate memory by number of elements
- *
- * @param nmemb Number of members to allocate.
- * @param size  Size of one member in bytes.
- *
- * @return Allocated memory or NULL.
- *
- */
-void *calloc(const size_t nmemb, const size_t size)
-{
-        // FIXME: Check for overflow
-
-        void *block = malloc(nmemb * size);
-        if (block == NULL)
-                return NULL;
-
-        memset(block, 0, nmemb * size);
-        return block;
-}
-
 /** Allocate memory
  *