[PATCH 1/3] fast-import: rename mem_pool to fi_mem_pool
- From
- jameson.miller81@gmail.com <jameson.miller81@gmail.com>
- Date
- Mar 21, 2018, 16:41 UTC
- Message-ID
- <20180321164152.204869-2-jamill@microsoft.com>
- In-Reply-To
- <20180321164152.204869-1-jamill@microsoft.com>
From: Jameson Miller <jamill@microsoft.com>
Rename the mem_pool variables and structs in fast-import.c that will conflict with an upcoming global mem_pool type.
Signed-off-by: Jameson Miller <jamill@microsoft.com> --- fast-import.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/fast-import.c b/fast-import.c index 58ef360da4..4e68acc156 100644 --- a/fast-import.c +++ b/fast-import.c @@ -209,8 +209,8 @@ struct last_object { unsigned no_swap : 1; }; -struct mem_pool { - struct mem_pool *next_pool; +struct fi_mem_pool { + struct fi_mem_pool *next_pool; char *next_free; char *end; uintmax_t space[FLEX_ARRAY]; /* more */ @@ -304,9 +304,9 @@ static int global_argc; static const char **global_argv; /* Memory pools */ -static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); +static size_t fi_mem_pool_alloc = 2*1024*1024 - sizeof(struct fi_mem_pool); static size_t total_allocd; -static struct mem_pool *mem_pool; +static struct fi_mem_pool *mem_pool; /* Atom management */ static unsigned int atom_table_sz = 4451; @@ -636,7 +636,7 @@ static unsigned int hc_str(const char *s, size_t len) static void *pool_alloc(size_t len) { - struct mem_pool *p; + struct fi_mem_pool *p; void *r; /* round up to a 'uintmax_t' alignment */ @@ -648,15 +648,15 @@ static void *pool_alloc(size_t len) break; if (!p) { - if (len >= (mem_pool_alloc/2)) { + if (len >= (fi_mem_pool_alloc/2)) { total_allocd += len; return xmalloc(len); } - total_allocd += sizeof(struct mem_pool) + mem_pool_alloc; - p = xmalloc(st_add(sizeof(struct mem_pool), mem_pool_alloc)); + total_allocd += sizeof(struct fi_mem_pool) + fi_mem_pool_alloc; + p = xmalloc(st_add(sizeof(struct fi_mem_pool), fi_mem_pool_alloc)); p->next_pool = mem_pool; p->next_free = (char *) p->space; - p->end = p->next_free + mem_pool_alloc; + p->end = p->next_free + fi_mem_pool_alloc; mem_pool = p; }
-- 2.14.3