From 9f4fc273892f130fd81d26e7cb9e561fb5a10679 Mon Sep 17 00:00:00 2001 From: "David T. Goldblatt" Date: Tue, 25 Feb 2020 07:47:04 -0800 Subject: [PATCH] Ehooks: Fix a build warning. We wrote `return some_void_func()` in a function returning void, which is confusing and triggers warnings on MSVC. --- include/jemalloc/internal/ehooks.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/jemalloc/internal/ehooks.h b/include/jemalloc/internal/ehooks.h index 1bd44cb8..bae468b3 100644 --- a/include/jemalloc/internal/ehooks.h +++ b/include/jemalloc/internal/ehooks.h @@ -222,9 +222,9 @@ ehooks_destroy(tsdn_t *tsdn, ehooks_t *ehooks, void *addr, size_t size, bool committed) { extent_hooks_t *extent_hooks = ehooks_get_extent_hooks_ptr(ehooks); if (extent_hooks == &ehooks_default_extent_hooks) { - return ehooks_default_destroy_impl(addr, size); + ehooks_default_destroy_impl(addr, size); } else if (extent_hooks->destroy == NULL) { - return; + /* Do nothing. */ } else { ehooks_pre_reentrancy(tsdn); extent_hooks->destroy(extent_hooks, addr, size, committed,