threads / patch / 65173

patchdir: avoid -Wdiscarded-qualifiers in remove_path()

Subject: [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path()

## tl;dr

4 messages between Mar 9, 2026 and Mar 10, 2026. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Collin Funk· Mar 9, 2026, 03:23 UTC · lore
When building with glibc-2.43 there is the following warning:
    dir.c:3526:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
     3526 |         slash = strrchr(name, '/');
          |               ^

In this case we use a non-const pointer to get the last slash of the unwritable file name, and then use it again to write in the strdup'd file name.

We can avoid this warning and make the code a bit more clear by using a separate variable to access the original argument and it's strdup'd copy.

Signed-off-by: Collin Funk <collin.funk1@gmail.com>
---
 dir.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Show changes to dir.c +4 −4
diff --git a/dir.c b/dir.c
index 026d8516a9..fcb8f6dd2a 100644
--- a/dir.c
+++ b/dir.c
@@ -3518,15 +3518,15 @@ int get_sparse_checkout_patterns(struct pattern_list *pl)
 
 int remove_path(const char *name)
 {
-	char *slash;
+	const char *last;
 
 	if (unlink(name) && !is_missing_file_error(errno))
 		return -1;
 
-	slash = strrchr(name, '/');
-	if (slash) {
+	last = strrchr(name, '/');
+	if (last) {
 		char *dirs = xstrdup(name);
-		slash = dirs + (slash - name);
+		char *slash = dirs + (last - name);
 		do {
 			*slash = '\0';
 			if (startup_info->original_cwd &&
-- 
2.53.0
Junio C Hamano· Mar 9, 2026, 14:59 UTC · re: Collin Funk · lore

Re: [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path()

Collin Funk <collin.funk1@gmail.com> writes:
Show 13 quoted lines
> When building with glibc-2.43 there is the following warning:
>
>     dir.c:3526:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
>      3526 |         slash = strrchr(name, '/');
>           |               ^
>
> In this case we use a non-const pointer to get the last slash of the
> unwritable file name, and then use it again to write in the strdup'd
> file name.
>
> We can avoid this warning and make the code a bit more clear by using a
> separate variable to access the original argument and it's strdup'd
> copy.
"it's" -> "its", if I am reading the above correctly?
Show 5 quoted lines
>
> Signed-off-by: Collin Funk <collin.funk1@gmail.com>
> ---
>  dir.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
The changes make sense.  Thanks.
Show 24 quoted lines
> diff --git a/dir.c b/dir.c
> index 026d8516a9..fcb8f6dd2a 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -3518,15 +3518,15 @@ int get_sparse_checkout_patterns(struct pattern_list *pl)
>  
>  int remove_path(const char *name)
>  {
> -	char *slash;
> +	const char *last;
>  
>  	if (unlink(name) && !is_missing_file_error(errno))
>  		return -1;
>  
> -	slash = strrchr(name, '/');
> -	if (slash) {
> +	last = strrchr(name, '/');
> +	if (last) {
>  		char *dirs = xstrdup(name);
> -		slash = dirs + (slash - name);
> +		char *slash = dirs + (last - name);
>  		do {
>  			*slash = '\0';
>  			if (startup_info->original_cwd &&
Collin Funk· Mar 10, 2026, 00:22 UTC · re: Junio C Hamano · lore

Re: [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path()

Junio C Hamano <gitster@pobox.com> writes:
Show 17 quoted lines
> Collin Funk <collin.funk1@gmail.com> writes:
>
>> When building with glibc-2.43 there is the following warning:
>>
>>     dir.c:3526:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
>>      3526 |         slash = strrchr(name, '/');
>>           |               ^
>>
>> In this case we use a non-const pointer to get the last slash of the
>> unwritable file name, and then use it again to write in the strdup'd
>> file name.
>>
>> We can avoid this warning and make the code a bit more clear by using a
>> separate variable to access the original argument and it's strdup'd
>> copy.
>
> "it's" -> "its", if I am reading the above correctly?
Yep, my mistake. Assuming you can fix that locally?

Thanks, Collin

Junio C Hamano· Mar 10, 2026, 00:57 UTC · re: Collin Funk · lore

Re: [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path()

> > "it's" -> "its", if I am reading the above correctly?
>
> Yep, my mistake. Assuming you can fix that locally?
Sure, will do.

← back to recent threads