# [PATCH] ewah: delete unused 'rlwit_discharge_empty()' 3 messages from 2018-06-19 to 2018-06-21. Participants: Ramsay Jones, Derrick Stolee, Junio C Hamano. Thread: https://gitlist.dev/t/48742 ## Ramsay Jones, 2018-06-19 21:51 Subject: [PATCH] ewah: delete unused 'rlwit_discharge_empty()' Message-ID: <7bfb528f-ef65-4de6-7d01-6ca91f0072e7@ramsayjones.plus.com> URL: https://gitlist.dev/e/7bfb528f-ef65-4de6-7d01-6ca91f0072e7%40ramsayjones.plus.com ``` From: Junio C Hamano 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 --- Hi Junio, Can you please add this to the 'ds/ewah-cleanup' branch, before we forget to do so! ;-) Thanks! ATB, Ramsay Jones ewah/ewah_bitmap.c | 20 ++++++++++++-------- ewah/ewah_rlw.c | 8 -------- ewah/ewok.h | 6 ------ ewah/ewok_rlw.h | 1 - 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 017c677f9..d59b1afe3 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -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) 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) diff --git a/ewah/ewah_rlw.c b/ewah/ewah_rlw.c index b9643b7d0..5093d43e2 100644 --- a/ewah/ewah_rlw.c +++ b/ewah/ewah_rlw.c @@ -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)); - } -} diff --git a/ewah/ewok.h b/ewah/ewok.h index 0c504f28e..84b2a29fa 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -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 */ diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h index bb3c6ff7e..7cdfdd0c0 100644 --- a/ewah/ewok_rlw.h +++ b/ewah/ewok_rlw.h @@ -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) { -- 2.17.0 ``` ## Derrick Stolee, 2018-06-19 23:49 Subject: Re: [PATCH] ewah: delete unused 'rlwit_discharge_empty()' Message-ID: <795ca948-1633-a1f7-1d7c-88ace8361445@gmail.com> URL: https://gitlist.dev/e/795ca948-1633-a1f7-1d7c-88ace8361445%40gmail.com In-Reply-To: <7bfb528f-ef65-4de6-7d01-6ca91f0072e7@ramsayjones.plus.com> ``` On 6/19/2018 5:51 PM, Ramsay Jones wrote: > From: Junio C Hamano > > 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 > --- > > Hi Junio, > > Can you please add this to the 'ds/ewah-cleanup' branch, before > we forget to do so! ;-) > > Thanks! > > ATB, > Ramsay Jones Looks good to me! Thanks! -Stolee > > ewah/ewah_bitmap.c | 20 ++++++++++++-------- > ewah/ewah_rlw.c | 8 -------- > ewah/ewok.h | 6 ------ > ewah/ewok_rlw.h | 1 - > 4 files changed, 12 insertions(+), 23 deletions(-) > > diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c > index 017c677f9..d59b1afe3 100644 > --- a/ewah/ewah_bitmap.c > +++ b/ewah/ewah_bitmap.c > @@ -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) > 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) > diff --git a/ewah/ewah_rlw.c b/ewah/ewah_rlw.c > index b9643b7d0..5093d43e2 100644 > --- a/ewah/ewah_rlw.c > +++ b/ewah/ewah_rlw.c > @@ -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)); > - } > -} > diff --git a/ewah/ewok.h b/ewah/ewok.h > index 0c504f28e..84b2a29fa 100644 > --- a/ewah/ewok.h > +++ b/ewah/ewok.h > @@ -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 > */ > diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h > index bb3c6ff7e..7cdfdd0c0 100644 > --- a/ewah/ewok_rlw.h > +++ b/ewah/ewok_rlw.h > @@ -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) > { ``` ## Junio C Hamano, 2018-06-21 16:39 Subject: Re: [PATCH] ewah: delete unused 'rlwit_discharge_empty()' Message-ID: URL: https://gitlist.dev/e/xmqqk1qst7ph.fsf%40gitster-ct.c.googlers.com In-Reply-To: <795ca948-1633-a1f7-1d7c-88ace8361445@gmail.com> ``` Derrick Stolee writes: > On 6/19/2018 5:51 PM, Ramsay Jones wrote: >> From: Junio C Hamano >> >> 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 >> --- >> >> Hi Junio, >> >> Can you please add this to the 'ds/ewah-cleanup' branch, before >> we forget to do so! ;-) >> >> Thanks! >> >> ATB, >> Ramsay Jones > > > Looks good to me! Thanks! Will do; thanks. ```