[PATCH] bloom: remove a misleading const qualifier

[PATCH] bloom: remove a misleading const qualifier

[Collin Funk]

When building with glibc-2.43 there is the following warning:

    bloom.c: In function ‘get_or_compute_bloom_filter’:
    bloom.c:515:52: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
      515 |                                 char *last_slash = strrchr(path, '/');
          |                                                    ^~~~~~~

In this case, we always write through "path" through the "last_slash"
pointer. Therefore, the const qualifier on "path" is misleading and we
can just remove it.

Signed-off-by: Collin Funk <collin.funk1@gmail.com>
---
 bloom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bloom.c b/bloom.c
index 77a6fddf72..a805ac0c29 100644
--- a/bloom.c
+++ b/bloom.c
@@ -501,7 +501,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
 		struct hashmap_iter iter;
 
 		for (i = 0; i < diff_queued_diff.nr; i++) {
-			const char *path = diff_queued_diff.queue[i]->two->path;
+			char *path = diff_queued_diff.queue[i]->two->path;
 
 			/*
 			 * Add each leading directory of the changed file, i.e. for
@@ -523,7 +523,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
 					free(e);
 
 				if (!last_slash)
-					last_slash = (char*)path;
+					last_slash = path;
 				*last_slash = '\0';
 
 			} while (*path);
-- 
2.53.0

Re: [PATCH] bloom: remove a misleading const qualifier

[Junio C Hamano]

Collin Funk <collin.funk1@gmail.com> writes:

> When building with glibc-2.43 there is the following warning:
>
>     bloom.c: In function ‘get_or_compute_bloom_filter’:
>     bloom.c:515:52: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
>       515 |                                 char *last_slash = strrchr(path, '/');
>           |                                                    ^~~~~~~
>
> In this case, we always write through "path" through the "last_slash"
> pointer. Therefore, the const qualifier on "path" is misleading and we
> can just remove it.

Right.  Thanks.


> Signed-off-by: Collin Funk <collin.funk1@gmail.com>
> ---
>  bloom.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/bloom.c b/bloom.c
> index 77a6fddf72..a805ac0c29 100644
> --- a/bloom.c
> +++ b/bloom.c
> @@ -501,7 +501,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
>  		struct hashmap_iter iter;
>  
>  		for (i = 0; i < diff_queued_diff.nr; i++) {
> -			const char *path = diff_queued_diff.queue[i]->two->path;
> +			char *path = diff_queued_diff.queue[i]->two->path;
>  
>  			/*
>  			 * Add each leading directory of the changed file, i.e. for
> @@ -523,7 +523,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
>  					free(e);
>  
>  				if (!last_slash)
> -					last_slash = (char*)path;
> +					last_slash = path;
>  				*last_slash = '\0';
>  
>  			} while (*path);