mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdiff: introduce xdl_calloc

Browse Source 
In preparation for introducing XDL_CALLOC_ARRAY() use calloc() to
obtain zeroed out memory rather than malloc() followed by memset(). To
try and keep the lines a reasonable length this commit also stops
casting the pointer returned by calloc() as this is unnecessary.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2022-07-08 16:25:17 +00:00
committed by Junio C Hamano
parent abf04bdaa8
commit 18aae7e21e
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xdiff/xhistogram.c
View File

@ -251,7 +251,7 @@ static int find_lcs(xpparam_t const *xpp, xdfenv_t *env,
int line1, int count1, int line2, int count2)
{
int b_ptr;
int sz, ret = -1;
int ret = -1;
struct histindex index;
memset(&index, 0, sizeof(index));
@ -265,23 +265,19 @@ static int find_lcs(xpparam_t const *xpp, xdfenv_t *env,
index.rcha.head = NULL;
index.table_bits = xdl_hashbits(count1);
sz = index.records_size = 1 << index.table_bits;
sz *= sizeof(struct record *);
if (!(index.records = (struct record **) xdl_malloc(sz)))
index.records_size = 1 << index.table_bits;
if (!(index.records = xdl_calloc(index.records_size,
sizeof(*index.records))))
goto cleanup;
memset(index.records, 0, sz);
sz = index.line_map_size = count1;
sz *= sizeof(struct record *);
if (!(index.line_map = (struct record **) xdl_malloc(sz)))
index.line_map_size = count1;
if (!(index.line_map = xdl_calloc(index.line_map_size,
sizeof(*index.line_map))))
goto cleanup;
memset(index.line_map, 0, sz);
sz = index.line_map_size;
sz *= sizeof(unsigned int);
if (!(index.next_ptrs = (unsigned int *) xdl_malloc(sz)))
if (!(index.next_ptrs = xdl_calloc(index.line_map_size,
sizeof(*index.next_ptrs))))
goto cleanup;
memset(index.next_ptrs, 0, sz);
/* lines / 4 + 1 comes from xprepare.c:xdl_prepare_ctx() */
if (xdl_cha_init(&index.rcha, sizeof(struct record), count1 / 4 + 1) < 0)