diff options
| author | Jeff King <peff@peff.net> | 2015-06-03 02:39:37 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-03 00:04:01 -0700 |
| commit | 34b935c01f28d34f6764f0e1140ad47e7abdde1b (patch) | |
| tree | f033bf6a1c6c1896e712c465ddaff50ad78fa3e2 /pack-bitmap.c | |
| parent | 414382fb00c72babe2b22ef0fa757ea7c960f5ce (diff) | |
| download | git-34b935c01f28d34f6764f0e1140ad47e7abdde1b.tar.gz | |
ewah: use less generic macro namees/osx-header-pollutes-mask-macro
The ewah/ewok.h header pollutes the global namespace with
"BITS_IN_WORD", without any specific notion that we are
talking about the bits in an eword_t. We can give this the
more specific name "BITS_IN_EWORD".
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 91e4101531..18f0e428b6 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -618,7 +618,7 @@ static void show_objects_for_type( while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { eword_t word = objects->words[i] & filter; - for (offset = 0; offset < BITS_IN_WORD; ++offset) { + for (offset = 0; offset < BITS_IN_EWORD; ++offset) { const unsigned char *sha1; struct revindex_entry *entry; uint32_t hash = 0; @@ -640,7 +640,7 @@ static void show_objects_for_type( show_reach(sha1, object_type, 0, hash, bitmap_git.pack, entry->offset); } - pos += BITS_IN_WORD; + pos += BITS_IN_EWORD; i++; } } @@ -772,7 +772,7 @@ int reuse_partial_packfile_from_bitmap(struct packed_git **packfile, break; } - reuse_objects += BITS_IN_WORD; + reuse_objects += BITS_IN_EWORD; } #ifdef GIT_BITMAP_DEBUG @@ -995,7 +995,7 @@ static int rebuild_bitmap(uint32_t *reposition, while (ewah_iterator_next(&word, &it)) { uint32_t offset, bit_pos; - for (offset = 0; offset < BITS_IN_WORD; ++offset) { + for (offset = 0; offset < BITS_IN_EWORD; ++offset) { if ((word >> offset) == 0) break; @@ -1008,7 +1008,7 @@ static int rebuild_bitmap(uint32_t *reposition, return -1; } - pos += BITS_IN_WORD; + pos += BITS_IN_EWORD; } return 0; } |