From 4a55daa363e9622a1c98a129bbda1b7086773fa6 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Wed, 1 Jun 2016 11:56:45 -0700
Subject: [PATCH] s/CHUNK_HOOKS_INITIALIZER/EXTENT_HOOKS_INITIALIZER/g

---
 include/jemalloc/internal/chunk.h  | 10 ----------
 include/jemalloc/internal/extent.h | 10 ++++++++++
 src/arena.c                        |  8 ++++----
 src/chunk.c                        |  2 +-
 src/chunk_dss.c                    |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/jemalloc/internal/chunk.h b/include/jemalloc/internal/chunk.h
index 10f2ae72..a6f6f7c3 100644
--- a/include/jemalloc/internal/chunk.h
+++ b/include/jemalloc/internal/chunk.h
@@ -11,16 +11,6 @@
 #define	CHUNK_CEILING(s)						\
 	(((s) + chunksize_mask) & ~chunksize_mask)
 
-#define	CHUNK_HOOKS_INITIALIZER {					\
-    NULL,								\
-    NULL,								\
-    NULL,								\
-    NULL,								\
-    NULL,								\
-    NULL,								\
-    NULL								\
-}
-
 #endif /* JEMALLOC_H_TYPES */
 /******************************************************************************/
 #ifdef JEMALLOC_H_STRUCTS
diff --git a/include/jemalloc/internal/extent.h b/include/jemalloc/internal/extent.h
index cf717d9e..b590ae0f 100644
--- a/include/jemalloc/internal/extent.h
+++ b/include/jemalloc/internal/extent.h
@@ -3,6 +3,16 @@
 
 typedef struct extent_s extent_t;
 
+#define	EXTENT_HOOKS_INITIALIZER {					\
+    NULL,								\
+    NULL,								\
+    NULL,								\
+    NULL,								\
+    NULL,								\
+    NULL,								\
+    NULL								\
+}
+
 #endif /* JEMALLOC_H_TYPES */
 /******************************************************************************/
 #ifdef JEMALLOC_H_STRUCTS
diff --git a/src/arena.c b/src/arena.c
index de6605a0..075082b1 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -347,7 +347,7 @@ arena_chunk_alloc_large(tsdn_t *tsdn, arena_t *arena, size_t usize,
     size_t alignment, bool *zero)
 {
 	extent_t *extent;
-	extent_hooks_t extent_hooks = CHUNK_HOOKS_INITIALIZER;
+	extent_hooks_t extent_hooks = EXTENT_HOOKS_INITIALIZER;
 
 	malloc_mutex_lock(tsdn, &arena->lock);
 
@@ -373,7 +373,7 @@ void
 arena_chunk_dalloc_large(tsdn_t *tsdn, arena_t *arena, extent_t *extent,
     bool locked)
 {
-	extent_hooks_t extent_hooks = CHUNK_HOOKS_INITIALIZER;
+	extent_hooks_t extent_hooks = EXTENT_HOOKS_INITIALIZER;
 
 	if (!locked)
 		malloc_mutex_lock(tsdn, &arena->lock);
@@ -866,7 +866,7 @@ arena_purge(tsdn_t *tsdn, arena_t *arena, bool all)
 static void
 arena_slab_dalloc(tsdn_t *tsdn, arena_t *arena, extent_t *slab)
 {
-	extent_hooks_t extent_hooks = CHUNK_HOOKS_INITIALIZER;
+	extent_hooks_t extent_hooks = EXTENT_HOOKS_INITIALIZER;
 
 	arena_nactive_sub(arena, extent_size_get(slab) >> LG_PAGE);
 	arena_chunk_cache_dalloc_locked(tsdn, arena, &extent_hooks, slab);
@@ -1009,7 +1009,7 @@ arena_slab_alloc(tsdn_t *tsdn, arena_t *arena, szind_t binind,
 {
 	extent_t *slab;
 	arena_slab_data_t *slab_data;
-	extent_hooks_t extent_hooks = CHUNK_HOOKS_INITIALIZER;
+	extent_hooks_t extent_hooks = EXTENT_HOOKS_INITIALIZER;
 	bool zero;
 
 	zero = false;
diff --git a/src/chunk.c b/src/chunk.c
index 2ac44b0a..7f80bb42 100644
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -131,7 +131,7 @@ extent_hooks_assure_initialized_impl(tsdn_t *tsdn, arena_t *arena,
     extent_hooks_t *extent_hooks, bool locked)
 {
 	static const extent_hooks_t uninitialized_hooks =
-	    CHUNK_HOOKS_INITIALIZER;
+	    EXTENT_HOOKS_INITIALIZER;
 
 	if (memcmp(extent_hooks, &uninitialized_hooks, sizeof(extent_hooks_t))
 	    == 0) {
diff --git a/src/chunk_dss.c b/src/chunk_dss.c
index c5323dea..9fa4ad81 100644
--- a/src/chunk_dss.c
+++ b/src/chunk_dss.c
@@ -137,7 +137,7 @@ chunk_alloc_dss(tsdn_t *tsdn, arena_t *arena, void *new_addr, size_t size,
 				malloc_mutex_unlock(tsdn, &dss_mtx);
 				if (pad_size != 0) {
 					extent_hooks_t extent_hooks =
-					    CHUNK_HOOKS_INITIALIZER;
+					    EXTENT_HOOKS_INITIALIZER;
 					chunk_dalloc_wrapper(tsdn, arena,
 					    &extent_hooks, pad);
 				} else