]> Savannah Git Hosting - gnulib.git/commitdiff
git-merge-changelog: port to size_t padding
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 21 May 2023 20:45:12 +0000 (13:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 21 May 2023 21:09:10 +0000 (14:09 -0700)
* lib/git-merge-changelog (entry_hashcode):
As a nicety, Prefer SIZE_WIDTH to computing it ourselves.

ChangeLog
lib/git-merge-changelog.c

index eb6066b42ce0ab2b4ebfc5517a848a68be9f4faf..8b29eed568a06bd136425c1736ad670c8067b227 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2023-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+       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)
index 604099628e96e124c3338a036adfc2a124659fa6..2d6a440644dacf49cc91c4a83c48711db76c1d52 100644 (file)
@@ -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;