Browse Source

ewah: delete unused 'rlwit_discharge_empty()'

Complete the removal of unused 'ewah bitmap' code by removing the now
unused 'rlwit_discharge_empty()' function. Also, the 'ewah_clear()'
function can now be made a file-scope static symbol.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 7 years ago
parent
commit
c806278e0c
  1. 20
      ewah/ewah_bitmap.c
  2. 8
      ewah/ewah_rlw.c
  3. 6
      ewah/ewok.h
  4. 1
      ewah/ewok_rlw.h

20
ewah/ewah_bitmap.c

@ -276,6 +276,18 @@ void ewah_each_bit(struct ewah_bitmap *self, void (*callback)(size_t, void*), vo @@ -276,6 +276,18 @@ void ewah_each_bit(struct ewah_bitmap *self, void (*callback)(size_t, void*), vo
}
}

/**
* Clear all the bits in the bitmap. Does not free or resize
* memory.
*/
static void ewah_clear(struct ewah_bitmap *self)
{
self->buffer_size = 1;
self->buffer[0] = 0;
self->bit_size = 0;
self->rlw = self->buffer;
}

struct ewah_bitmap *ewah_new(void)
{
struct ewah_bitmap *self;
@ -288,14 +300,6 @@ struct ewah_bitmap *ewah_new(void) @@ -288,14 +300,6 @@ struct ewah_bitmap *ewah_new(void)
return self;
}

void ewah_clear(struct ewah_bitmap *self)
{
self->buffer_size = 1;
self->buffer[0] = 0;
self->bit_size = 0;
self->rlw = self->buffer;
}

void ewah_free(struct ewah_bitmap *self)
{
if (!self)

8
ewah/ewah_rlw.c

@ -104,11 +104,3 @@ size_t rlwit_discharge( @@ -104,11 +104,3 @@ size_t rlwit_discharge(

return index;
}

void rlwit_discharge_empty(struct rlw_iterator *it, struct ewah_bitmap *out)
{
while (rlwit_word_size(it) > 0) {
ewah_add_empty_words(out, 0, rlwit_word_size(it));
rlwit_discard_first_words(it, rlwit_word_size(it));
}
}

6
ewah/ewok.h

@ -72,12 +72,6 @@ void ewah_pool_free(struct ewah_bitmap *self); @@ -72,12 +72,6 @@ void ewah_pool_free(struct ewah_bitmap *self);
*/
struct ewah_bitmap *ewah_new(void);

/**
* Clear all the bits in the bitmap. Does not free or resize
* memory.
*/
void ewah_clear(struct ewah_bitmap *self);

/**
* Free all the memory of the bitmap
*/

1
ewah/ewok_rlw.h

@ -98,7 +98,6 @@ void rlwit_init(struct rlw_iterator *it, struct ewah_bitmap *bitmap); @@ -98,7 +98,6 @@ void rlwit_init(struct rlw_iterator *it, struct ewah_bitmap *bitmap);
void rlwit_discard_first_words(struct rlw_iterator *it, size_t x);
size_t rlwit_discharge(
struct rlw_iterator *it, struct ewah_bitmap *out, size_t max, int negate);
void rlwit_discharge_empty(struct rlw_iterator *it, struct ewah_bitmap *out);

static inline size_t rlwit_word_size(struct rlw_iterator *it)
{

Loading…
Cancel
Save