From b8f0a651736f977134edeec5875b083e477c3444 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Mon, 29 Jun 2009 09:41:43 -0700 Subject: [PATCH] Fix various compiler warnings. Reported by: Mark Rabkin --- jemalloc/src/jemalloc.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c index 2ed9491d..01fb8780 100644 --- a/jemalloc/src/jemalloc.c +++ b/jemalloc/src/jemalloc.c @@ -1065,7 +1065,9 @@ static bool opt_utrace = false; #ifdef JEMALLOC_SYSV static bool opt_sysv = false; #endif +#ifdef JEMALLOC_XMALLOC static bool opt_xmalloc = false; +#endif #ifdef JEMALLOC_FILL static bool opt_zero = false; #endif @@ -1109,7 +1111,6 @@ static bool base_pages_alloc_dss(size_t minsize); static bool base_pages_alloc_mmap(size_t minsize); static bool base_pages_alloc(size_t minsize); static void *base_alloc(size_t size); -static void *base_calloc(size_t number, size_t size); static extent_node_t *base_node_alloc(void); static void base_node_dealloc(extent_node_t *node); #ifdef JEMALLOC_STATS @@ -1656,17 +1657,6 @@ base_alloc(size_t size) return (ret); } -static void * -base_calloc(size_t number, size_t size) -{ - void *ret; - - ret = base_alloc(number * size); - memset(ret, 0, number * size); - - return (ret); -} - static extent_node_t * base_node_alloc(void) { @@ -1809,7 +1799,7 @@ extent_szad_comp(extent_node_t *a, extent_node_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static, extent_tree_szad_, extent_tree_t, extent_node_t, +rb_wrap(static __attribute__((unused)), extent_tree_szad_, extent_tree_t, extent_node_t, link_szad, extent_szad_comp) #endif @@ -1823,7 +1813,7 @@ extent_ad_comp(extent_node_t *a, extent_node_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad, +rb_wrap(static __attribute__((unused)), extent_tree_ad_, extent_tree_t, extent_node_t, link_ad, extent_ad_comp) /* @@ -2371,7 +2361,7 @@ arena_chunk_comp(arena_chunk_t *a, arena_chunk_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static, arena_chunk_tree_dirty_, arena_chunk_tree_t, +rb_wrap(static __attribute__((unused)), arena_chunk_tree_dirty_, arena_chunk_tree_t, arena_chunk_t, link_dirty, arena_chunk_comp) static inline int @@ -2387,7 +2377,7 @@ arena_run_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t, +rb_wrap(static __attribute__((unused)), arena_run_tree_, arena_run_tree_t, arena_chunk_map_t, link, arena_run_comp) static inline int @@ -2419,7 +2409,7 @@ arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static, arena_avail_tree_, arena_avail_tree_t, +rb_wrap(static __attribute__((unused)), arena_avail_tree_, arena_avail_tree_t, arena_chunk_map_t, link, arena_avail_comp) static inline void * @@ -5657,7 +5647,9 @@ realloc(void *ptr, size_t size) } } +#ifdef JEMALLOC_SYSV RETURN: +#endif UTRACE(ptr, size, ret); return (ret); }