Merge branch 'da/mergetool-delete-delete-conflict'

diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index fcd465e9c24ef992b156a5242faabaf7272003be..2dc9c82ecf513ed721f290926f042b9f592221c2 100644 (file)
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -39,8 +39,7 @@ static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size)
                return;
 
        self->alloc_size = new_size;
-       self->buffer = xrealloc(self->buffer,
-               self->alloc_size * sizeof(eword_t));
+       REALLOC_ARRAY(self->buffer, self->alloc_size);
        self->rlw = self->buffer + (rlw_offset / sizeof(eword_t));
 }
 
@@ -283,8 +282,8 @@ struct ewah_bitmap *ewah_new(void)
        struct ewah_bitmap *self;
 
        self = xmalloc(sizeof(struct ewah_bitmap));
-       self->buffer = xmalloc(32 * sizeof(eword_t));
        self->alloc_size = 32;
+       ALLOC_ARRAY(self->buffer, self->alloc_size);
 
        ewah_clear(self);
        return self;