Changeset 5f70118 in mainline for uspace/lib/libc/generic/malloc.c

Timestamp:

2010-01-10T12:16:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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.

Message:

Merge mainline changes.

File:

• uspace/lib/libc/generic/malloc.c (modified) (1 diff)

uspace/lib/libc/generic/malloc.c

@@ -353 +353 @@
 }
 
+void *calloc(const size_t nmemb, const size_t size)
+{
+        void *block = malloc(nmemb * size);
+        if (block == NULL)
+                return NULL;
+
+        memset(block, 0, nmemb * size);
+        return block;
+}
+
 void *malloc(const size_t size)
 {