From 50cd636eedfdc14d68f3917055fe2cc3fc72e853 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 21 Jul 2015 09:13:57 +0900 Subject: Remove JEMALLOC_ALLOC_SIZE annotations on functions not returning pointers As per gcc documentation: The alloc_size attribute is used to tell the compiler that the function return value points to memory (...) This resolves #245. --- include/jemalloc/jemalloc_protos.h.in | 4 ++-- src/jemalloc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/jemalloc/jemalloc_protos.h.in b/include/jemalloc/jemalloc_protos.h.in index e77bd28..ef4b35e 100644 --- a/include/jemalloc/jemalloc_protos.h.in +++ b/include/jemalloc/jemalloc_protos.h.in @@ -13,7 +13,7 @@ JEMALLOC_EXPORT void *@je_@calloc(size_t num, size_t size) JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) JEMALLOC_NOTHROW; JEMALLOC_EXPORT int @je_@posix_memalign(void **memptr, size_t alignment, size_t size) JEMALLOC_CXX_THROW JEMALLOC_ATTR(nonnull(1)) - JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW; + JEMALLOC_NOTHROW; JEMALLOC_EXPORT void *@je_@aligned_alloc(size_t alignment, size_t size) JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW; @@ -27,7 +27,7 @@ JEMALLOC_EXPORT void *@je_@mallocx(size_t size, int flags) JEMALLOC_EXPORT void *@je_@rallocx(void *ptr, size_t size, int flags) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW; JEMALLOC_EXPORT size_t @je_@xallocx(void *ptr, size_t size, size_t extra, - int flags) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW; + int flags) JEMALLOC_NOTHROW; JEMALLOC_EXPORT size_t @je_@sallocx(const void *ptr, int flags) JEMALLOC_ATTR(pure) JEMALLOC_NOTHROW; JEMALLOC_EXPORT void @je_@dallocx(void *ptr, int flags) JEMALLOC_NOTHROW; diff --git a/src/jemalloc.c b/src/jemalloc.c index fc223da..cf6b78f 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1531,7 +1531,7 @@ label_oom: } JEMALLOC_EXPORT int -JEMALLOC_ATTR(nonnull(1)) JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW +JEMALLOC_ATTR(nonnull(1)) JEMALLOC_NOTHROW je_posix_memalign(void **memptr, size_t alignment, size_t size) { int ret = imemalign(memptr, alignment, size, sizeof(void *)); @@ -2277,7 +2277,7 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size, } JEMALLOC_EXPORT size_t -JEMALLOC_ALLOC_SIZE(2) JEMALLOC_NOTHROW +JEMALLOC_NOTHROW je_xallocx(void *ptr, size_t size, size_t extra, int flags) { tsd_t *tsd; -- cgit v0.12