Skip to content

Commit 9a87f6c

Browse files
committed
move calloc to its own file
1 parent 22b1830 commit 9a87f6c

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
ALL = libmallocng.a libmallocng.so
3-
SRCS = malloc.c free.c realloc.c aligned_alloc.c posix_memalign.c memalign.c malloc_usable_size.c dump.c
3+
SRCS = malloc.c calloc.c free.c realloc.c aligned_alloc.c posix_memalign.c memalign.c malloc_usable_size.c dump.c
44
OBJS = $(SRCS:.c=.o)
55
CFLAGS = -fPIC -Wall -O2 -ffreestanding
66

calloc.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#include <stdlib.h>
2+
#include <string.h>
3+
#include <errno.h>
4+
#include "meta.h"
5+
6+
void *calloc(size_t m, size_t n)
7+
{
8+
if (n && m > (size_t)-1/n) {
9+
errno = ENOMEM;
10+
return 0;
11+
}
12+
n *= m;
13+
void *p = malloc(n);
14+
if (!p) return p;
15+
return n >= MMAP_THRESHOLD ? p : memset(p, 0, n);
16+
}

malloc.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -378,15 +378,3 @@ void *malloc(size_t n)
378378
unlock();
379379
return enframe(g, idx, n, ctr);
380380
}
381-
382-
void *calloc(size_t m, size_t n)
383-
{
384-
if (n && m > (size_t)-1/n) {
385-
errno = ENOMEM;
386-
return 0;
387-
}
388-
n *= m;
389-
void *p = malloc(n);
390-
if (!p) return p;
391-
return n >= MMAP_THRESHOLD ? p : memset(p, 0, n);
392-
}

0 commit comments

Comments
 (0)