From ff86bf898f4fc209c237a05579a348102233fe59 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 21 May 2023 13:45:12 -0700 Subject: [PATCH] git-merge-changelog: port to size_t padding * lib/git-merge-changelog (entry_hashcode): As a nicety, Prefer SIZE_WIDTH to computing it ourselves. --- ChangeLog | 4 ++++ lib/git-merge-changelog.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eb6066b42c..8b29eed568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2023-05-21 Paul Eggert + git-merge-changelog: port to size_t padding + * lib/git-merge-changelog (entry_hashcode): + As a nicety, Prefer SIZE_WIDTH to computing it ourselves. + git-merge-changelog: prefer idx_t * lib/git-merge-changelog.c: Include idx.h. (struct entry, entry_create, entry_hashcode) diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 604099628e..2d6a440644 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -238,7 +238,7 @@ entry_hashcode (const void *elt) size_t h = 0; for (s = entry->string, n = entry->length; n > 0; s++, n--) - h = (unsigned char) *s + ((h << 9) | (h >> (sizeof (size_t) * CHAR_BIT - 9))); + h = (unsigned char) *s + ((h << 9) | (h >> (SIZE_WIDTH - 9))); entry->hashcode = h; entry->hashcode_cached = true; -- 2.39.5