diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-31 22:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-31 22:02:23 -0700 |
| commit | 3c20c106a0023646a37e72fb80f3d7a1c7e43f70 (patch) | |
| tree | cbac2232f9a2422e401ad221468be06fa3ab4575 | |
| parent | 9a98f12be35aa6bb9c50cf03e7deb1404f574e6c (diff) | |
| parent | 41639fe4e555c5bf70dbbcba3f07db2672eb396e (diff) | |
| download | git-3c20c106a0023646a37e72fb80f3d7a1c7e43f70.tar.gz | |
Merge branch 'jm/mem-pool' into jch
An reusable "memory pool" implementation has been extracted from
fast-import.c, which in turn has become the first user of the
mem-pool API.
* jm/mem-pool:
SQUASH??? fast-import: fix a sparse 'NULL pointer' warning
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index c18f724077..1e5f894b6e 100644 --- a/fast-import.c +++ b/fast-import.c @@ -300,7 +300,7 @@ static int global_argc; static const char **global_argv; /* Memory pools */ -static struct mem_pool fi_mem_pool = {0, 2*1024*1024 - sizeof(struct mp_block), 0 }; +static struct mem_pool fi_mem_pool = {NULL, 2*1024*1024 - sizeof(struct mp_block), 0 }; /* Atom management */ static unsigned int atom_table_sz = 4451; |