diff options
author | Rich Felker <dalias@aerifal.cx> | 2012-08-25 23:15:13 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2012-08-25 23:15:13 -0400 |
commit | 9bff7c133e73ecfb200614d7a7d386a164a1a61f (patch) | |
tree | 79941a40c606ca444994d0066524024f952f3698 /src/malloc/posix_memalign.c | |
parent | b5289fd749bc4d2637610d712f8fe650f214f1d5 (diff) | |
download | musl-9bff7c133e73ecfb200614d7a7d386a164a1a61f.tar.gz |
implement "low hanging fruit" from C11
based on Gregor's patch sent to the list. includes:
- stdalign.h
- removing gets in C11 mode
- adding aligned_alloc and adjusting other functions to use it
- adding 'x' flag to fopen for exclusive mode
Diffstat (limited to 'src/malloc/posix_memalign.c')
-rw-r--r-- | src/malloc/posix_memalign.c | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/src/malloc/posix_memalign.c b/src/malloc/posix_memalign.c index 2ae928c8..42cf2740 100644 --- a/src/malloc/posix_memalign.c +++ b/src/malloc/posix_memalign.c @@ -1,47 +1,10 @@ #include <stdlib.h> -#include <stdint.h> #include <errno.h> -/* This function should work with most dlmalloc-like chunk bookkeeping - * systems, but it's only guaranteed to work with the native implementation - * used in this library. */ - int posix_memalign(void **res, size_t align, size_t len) { - unsigned char *mem, *new, *end; - size_t header, footer; - - if ((align & -align & -sizeof(void *)) != align) return EINVAL; - if (len > SIZE_MAX - align) return ENOMEM; - - if (align <= 4*sizeof(size_t)) { - if (!(mem = malloc(len))) - return errno; - *res = mem; - return 0; - } - - if (!(mem = malloc(len + align-1))) - return errno; - - header = ((size_t *)mem)[-1]; - end = mem + (header & -8); - footer = ((size_t *)end)[-2]; - new = (void *)((uintptr_t)mem + align-1 & -align); - - if (!(header & 7)) { - ((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem); - ((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem); - *res = new; - return 0; - } - - ((size_t *)mem)[-1] = header&7 | new-mem; - ((size_t *)new)[-2] = footer&7 | new-mem; - ((size_t *)new)[-1] = header&7 | end-new; - ((size_t *)end)[-2] = footer&7 | end-new; - - if (new != mem) free(mem); - *res = new; + void *mem = aligned_alloc(align, len); + if (!mem) return errno; + *res = mem; return 0; } |