* [PATCH] ewah: delete unused 'rlwit_discharge_empty()'
@ 2018-06-19 21:51 Ramsay Jones
2018-06-19 23:49 ` Derrick Stolee
0 siblings, 1 reply; 3+ messages in thread
From: Ramsay Jones @ 2018-06-19 21:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list, Jeff King, Derrick Stolee
From: Junio C Hamano <gitster@pobox.com>
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ewah: delete unused 'rlwit_discharge_empty()'
2018-06-19 21:51 [PATCH] ewah: delete unused 'rlwit_discharge_empty()' Ramsay Jones
@ 2018-06-19 23:49 ` Derrick Stolee
2018-06-21 16:39 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Derrick Stolee @ 2018-06-19 23:49 UTC (permalink / raw)
To: Ramsay Jones, Junio C Hamano; +Cc: GIT Mailing-list, Jeff King, Derrick Stolee
On 6/19/2018 5:51 PM, Ramsay Jones wrote:
> From: Junio C Hamano <gitster@pobox.com>
>
> 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>
> ---
>
> 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)
> {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ewah: delete unused 'rlwit_discharge_empty()'
2018-06-19 23:49 ` Derrick Stolee
@ 2018-06-21 16:39 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2018-06-21 16:39 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Ramsay Jones, GIT Mailing-list, Jeff King, Derrick Stolee
Derrick Stolee <stolee@gmail.com> writes:
> On 6/19/2018 5:51 PM, Ramsay Jones wrote:
>> From: Junio C Hamano <gitster@pobox.com>
>>
>> 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>
>> ---
>>
>> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-21 16:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-19 21:51 [PATCH] ewah: delete unused 'rlwit_discharge_empty()' Ramsay Jones
2018-06-19 23:49 ` Derrick Stolee
2018-06-21 16:39 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).