project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various compiler warnings.

Browse Source 
Reported by:	Mark Rabkin
This commit is contained in:
Jason Evans 2009-06-29 09:41:43 -07:00
parent a9b0125e97
commit b8f0a65173
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jemalloc/src/jemalloc.c
View File

@ -1065,7 +1065,9 @@ static bool opt_utrace = false;
#ifdef JEMALLOC_SYSV #ifdef JEMALLOC_SYSV
static bool opt_sysv = false; static bool opt_sysv = false;
#endif #endif
#ifdef JEMALLOC_XMALLOC
static bool opt_xmalloc = false; static bool opt_xmalloc = false;
#endif
#ifdef JEMALLOC_FILL #ifdef JEMALLOC_FILL
static bool opt_zero = false; static bool opt_zero = false;
#endif #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_mmap(size_t minsize);
static bool base_pages_alloc(size_t minsize); static bool base_pages_alloc(size_t minsize);
static void *base_alloc(size_t size); 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 extent_node_t *base_node_alloc(void);
static void base_node_dealloc(extent_node_t *node); static void base_node_dealloc(extent_node_t *node);
#ifdef JEMALLOC_STATS #ifdef JEMALLOC_STATS
@ -1656,17 +1657,6 @@ base_alloc(size_t size)
return (ret); 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 * static extent_node_t *
base_node_alloc(void) 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. */ /* 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) link_szad, extent_szad_comp)
#endif #endif
@ -1823,7 +1813,7 @@ extent_ad_comp(extent_node_t *a, extent_node_t *b)
} }
/* Wrap red-black tree macros in functions. */ /* 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) 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. */ /* 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) arena_chunk_t, link_dirty, arena_chunk_comp)
static inline int 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. */ /* 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) link, arena_run_comp)
static inline int 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. */ /* 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) arena_chunk_map_t, link, arena_avail_comp)
static inline void * static inline void *
@ -5657,7 +5647,9 @@ realloc(void *ptr, size_t size)
} }
} }
#ifdef JEMALLOC_SYSV
RETURN: RETURN:
#endif
UTRACE(ptr, size, ret); UTRACE(ptr, size, ret);
return (ret); return (ret);
} }