undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diffcore-delta.c: LLP64 compatibility, upcast unity for left shift

Browse Source 
Visual Studio reports C4334 "was 64-bit shift intended" warning
because of size miss-match.

Promote unity to the matching type to fit with its subsequent operation.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philip Oakley 2021-12-01 00:29:01 +00:00 committed by Junio C Hamano
parent a43abad1e3
commit 62e8452c8c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diffcore-delta.c
View File

@ -133,10 +133,10 @@ static struct spanhash_top *hash_chars(struct repository *r,
i = INITIAL_HASH_SIZE; i = INITIAL_HASH_SIZE;
hash = xmalloc(st_add(sizeof(*hash), hash = xmalloc(st_add(sizeof(*hash),
st_mult(sizeof(struct spanhash), 1<<i))); st_mult(sizeof(struct spanhash), (size_t)1 << i)));
hash->alloc_log2 = i; hash->alloc_log2 = i;
hash->free = INITIAL_FREE(i); hash->free = INITIAL_FREE(i);
memset(hash->data, 0, sizeof(struct spanhash) * (1<<i)); memset(hash->data, 0, sizeof(struct spanhash) * ((size_t)1 << i));
n = 0; n = 0;
accum1 = accum2 = 0; accum1 = accum2 = 0;
@ -159,7 +159,7 @@ static struct spanhash_top *hash_chars(struct repository *r,
n = 0; n = 0;
accum1 = accum2 = 0; accum1 = accum2 = 0;
} }
QSORT(hash->data, 1ul << hash->alloc_log2, spanhash_cmp); QSORT(hash->data, (size_t)1ul << hash->alloc_log2, spanhash_cmp);
return hash; return hash;
} }