diff options
| -rw-r--r-- | gl/lib/di-set.c | 10 | ||||
| -rw-r--r-- | gl/lib/ino-map.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/gl/lib/di-set.c b/gl/lib/di-set.c index ba44bcfff..892950dbb 100644 --- a/gl/lib/di-set.c +++ b/gl/lib/di-set.c @@ -78,11 +78,13 @@ di_ent_hash (void const *x, size_t table_size) struct di_ent const *p = x; dev_t dev = p->dev; - /* Exclusive-OR the words of DEV into H. This avoids loss of info, - without using a wider % that could be quite slow. */ + /* When DEV is wider than size_t, exclusive-OR the words of DEV into H. + This avoids loss of info, without applying % to the wider type, + which could be quite slow on some systems. */ size_t h = dev; - int i; - for (i = 1; i < sizeof dev / sizeof h + (sizeof dev % sizeof h != 0); i++) + unsigned int i; + unsigned int n_words = sizeof dev / sizeof h + (sizeof dev % sizeof h != 0); + for (i = 1; i < n_words; i++) h ^= dev >> CHAR_BIT * sizeof h * i; return h % table_size; diff --git a/gl/lib/ino-map.c b/gl/lib/ino-map.c index cc9a131c9..f6fdd6395 100644 --- a/gl/lib/ino-map.c +++ b/gl/lib/ino-map.c @@ -56,11 +56,13 @@ ino_hash (void const *x, size_t table_size) struct ino_map_ent const *p = x; ino_t ino = p->ino; - /* Exclusive-OR the words of INO into H. This avoids loss of info, - without using a wider % that could be quite slow. */ + /* When INO is wider than size_t, exclusive-OR the words of INO into H. + This avoids loss of info, without applying % to the wider type, + which could be quite slow on some systems. */ size_t h = ino; - int i; - for (i = 1; i < sizeof ino / sizeof h + (sizeof ino % sizeof h != 0); i++) + unsigned int i; + unsigned int n_words = sizeof ino / sizeof h + (sizeof ino % sizeof h != 0); + for (i = 1; i < n_words; i++) h ^= ino >> CHAR_BIT * sizeof h * i; return h % table_size; |