From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:03:23 +0000 (-0700)
Subject: Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint
X-Git-Tag: v2.12.2~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/06c0ed7bfb5f05fe787e77371ef4c74c4fc245b4?hp=1f6b1afea00cdbc99114b88768aa5e617ff479df

Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint

Code clean-up.

* jk/ewah-use-right-type-in-sizeof:
ewah: fix eword_t/uint64_t confusion
---

diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c
index 61f6a43579..f73210973f 100644
--- a/ewah/ewah_io.c
+++ b/ewah/ewah_io.c
@@ -142,8 +142,8 @@ int ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len)
 	 * the endianness conversion in a separate pass to ensure
 	 * we're loading 8-byte aligned words.
 	 */
-	memcpy(self->buffer, ptr, self->buffer_size * sizeof(uint64_t));
-	ptr += self->buffer_size * sizeof(uint64_t);
+	memcpy(self->buffer, ptr, self->buffer_size * sizeof(eword_t));
+	ptr += self->buffer_size * sizeof(eword_t);
 
 	for (i = 0; i < self->buffer_size; ++i)
 		self->buffer[i] = ntohll(self->buffer[i]);