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?ds=inline;hp=-c

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
---

06c0ed7bfb5f05fe787e77371ef4c74c4fc245b4
diff --combined ewah/ewah_io.c
index 61f6a43579,84eaf89433..f73210973f
--- a/ewah/ewah_io.c
+++ b/ewah/ewah_io.c
@@@ -19,7 -19,6 +19,7 @@@
   */
  #include "git-compat-util.h"
  #include "ewok.h"
 +#include "strbuf.h"
  
  int ewah_serialize_native(struct ewah_bitmap *self, int fd)
  {
@@@ -111,21 -110,9 +111,21 @@@ int ewah_serialize(struct ewah_bitmap *
  	return ewah_serialize_to(self, write_helper, (void *)(intptr_t)fd);
  }
  
 -int ewah_read_mmap(struct ewah_bitmap *self, void *map, size_t len)
 +static int write_strbuf(void *user_data, const void *data, size_t len)
  {
 -	uint8_t *ptr = map;
 +	struct strbuf *sb = user_data;
 +	strbuf_add(sb, data, len);
 +	return len;
 +}
 +
 +int ewah_serialize_strbuf(struct ewah_bitmap *self, struct strbuf *sb)
 +{
 +	return ewah_serialize_to(self, write_strbuf, sb);
 +}
 +
 +int ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len)
 +{
 +	const uint8_t *ptr = map;
  	size_t i;
  
  	self->bit_size = get_be32(ptr);
@@@ -134,7 -121,11 +134,7 @@@
  	self->buffer_size = self->alloc_size = get_be32(ptr);
  	ptr += sizeof(uint32_t);
  
 -	self->buffer = ewah_realloc(self->buffer,
 -		self->alloc_size * sizeof(eword_t));
 -
 -	if (!self->buffer)
 -		return -1;
 +	REALLOC_ARRAY(self->buffer, self->alloc_size);
  
  	/*
  	 * Copy the raw data for the bitmap as a whole chunk;
@@@ -142,8 -133,8 +142,8 @@@
  	 * 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]);
@@@ -176,7 -167,11 +176,7 @@@ int ewah_deserialize(struct ewah_bitma
  		return -1;
  
  	self->buffer_size = self->alloc_size = (size_t)ntohl(word_count);
 -	self->buffer = ewah_realloc(self->buffer,
 -		self->alloc_size * sizeof(eword_t));
 -
 -	if (!self->buffer)
 -		return -1;
 +	REALLOC_ARRAY(self->buffer, self->alloc_size);
  
  	/** 64 bit x N -- compressed words */
  	buffer = self->buffer;