X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmalloc%2Fposix_memalign.c;h=42cf27405a23d4b50dfb32df6bbba854aa0675ff;hb=c82f53f67cb256e0096c8649235028b6613b9a22;hp=ef86260d81689391c2a7ed0dd6e1afefad9b1846;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/malloc/posix_memalign.c b/src/malloc/posix_memalign.c
index ef86260d..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) != 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;
 }