| commit | cdf2241c717b05845ff9e25b87be6ca7559e82eb | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 30 Jul 2021 11:47:38 +0000 (30 11:47 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Jul 2021 16:01:18 +0000 (30 09:01 -0700) | ||
| tree | 21ecd672592db9cd230f74926370201e0c637efb | treesnapshot (tar.gz zip) |
| parent | fa0e936fbb683dbce70b797ae8a5be6b88f48d88 | commitdiff |
merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
Make the code more flexible so that it can handle both being run with or
without a memory pool by adding utility functions which will either call
xmalloc, xcalloc, xstrndup
or
mem_pool_alloc, mem_pool_calloc, mem_pool_strndup
depending on whether we have a non-NULL memory pool. A subsequent
commit will make use of these.
(We will actually be dropping these functions soon and just assuming we
always have a memory pool, but the flexibility was very useful during
development of merge-ort so I want to be able to restore it if needed.)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Make the code more flexible so that it can handle both being run with or
without a memory pool by adding utility functions which will either call
xmalloc, xcalloc, xstrndup
or
mem_pool_alloc, mem_pool_calloc, mem_pool_strndup
depending on whether we have a non-NULL memory pool. A subsequent
commit will make use of these.
(We will actually be dropping these functions soon and just assuming we
always have a memory pool, but the flexibility was very useful during
development of merge-ort so I want to be able to restore it if needed.)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |