X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmalloc%2Fmemalign.c;h=32cd87d812f7f4228d1f85932f7a7dbb75777de7;hb=3b7b4155570b4b9054465785be2992c92cb7d7b1;hp=006bd21c7673858a0206d8d131b9971a1d8bcad4;hpb=4a30ba5ca4072e85e42e84547572e958871952a2;p=musl

diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c
index 006bd21c..32cd87d8 100644
--- a/src/malloc/memalign.c
+++ b/src/malloc/memalign.c
@@ -1,57 +1,7 @@
+#define _BSD_SOURCE
 #include <stdlib.h>
-#include <stdint.h>
-#include <errno.h>
-#include "libc.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. */
-
-void *__memalign(size_t align, size_t len)
+void *memalign(size_t align, size_t len)
 {
-	unsigned char *mem, *new, *end;
-	size_t header, footer;
-
-	if ((align & -align) != align) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (len > SIZE_MAX - align) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	if (align <= 4*sizeof(size_t)) {
-		if (!(mem = malloc(len)))
-			return NULL;
-		return mem;
-	}
-
-	if (!(mem = malloc(len + align-1)))
-		return NULL;
-
-	new = (void *)((uintptr_t)mem + align-1 & -align);
-	if (new == mem) return mem;
-
-	header = ((size_t *)mem)[-1];
-
-	if (!(header & 7)) {
-		((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem);
-		((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem);
-		return new;
-	}
-
-	end = mem + (header & -8);
-	footer = ((size_t *)end)[-2];
-
-	((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;
-
-	free(mem);
-	return new;
+	return aligned_alloc(align, len);
 }
-
-weak_alias(__memalign, memalign);