projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on failed aio submission, set aiocb error and return value
[musl]
/
src
/
malloc
/
lite_malloc.c
diff --git
a/src/malloc/lite_malloc.c
b/src/malloc/lite_malloc.c
index
a7e4a9f
..
050d84f
100644
(file)
--- a/
src/malloc/lite_malloc.c
+++ b/
src/malloc/lite_malloc.c
@@
-2,16
+2,15
@@
#include <stdint.h>
#include <limits.h>
#include <errno.h>
#include <stdint.h>
#include <limits.h>
#include <errno.h>
-#include "libc.h"
+#include "lock.h"
+#include "malloc_impl.h"
#define ALIGN 16
#define ALIGN 16
-void *__expand_heap(size_t *);
-
static void *__simple_malloc(size_t n)
{
static char *cur, *end;
static void *__simple_malloc(size_t n)
{
static char *cur, *end;
- static volatile int lock[
2
];
+ static volatile int lock[
1
];
size_t align=1, pad;
void *p;
size_t align=1, pad;
void *p;
@@
-47,4
+46,14
@@
static void *__simple_malloc(size_t n)
}
weak_alias(__simple_malloc, malloc);
}
weak_alias(__simple_malloc, malloc);
-weak_alias(__simple_malloc, __malloc0);
+
+static void *__simple_calloc(size_t m, size_t n)
+{
+ if (n && m > (size_t)-1/n) {
+ errno = ENOMEM;
+ return 0;
+ }
+ return __simple_malloc(n * m);
+}
+
+weak_alias(__simple_calloc, calloc);