public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Collin Funk <collin.funk1@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Derrick Stolee" <stolee@gmail.com>,
	"Elijah Newren" <newren@gmail.com>
Subject: Re: [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path()
Date: Mon, 09 Mar 2026 07:59:35 -0700	[thread overview]
Message-ID: <xmqqbjgx6obs.fsf@gitster.g> (raw)
In-Reply-To: <3ad40c3d0762c2e8c14792dfb68cba9f63a883a3.1773026586.git.collin.funk1@gmail.com> (Collin Funk's message of "Sun, 8 Mar 2026 20:23:06 -0700")

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?

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

The changes make sense.  Thanks.

> 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 &&

  reply	other threads:[~2026-03-09 14:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-09  3:23 [PATCH] dir: avoid -Wdiscarded-qualifiers in remove_path() Collin Funk
2026-03-09 14:59 ` Junio C Hamano [this message]
2026-03-10  0:22   ` Collin Funk
2026-03-10  0:57     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqbjgx6obs.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=collin.funk1@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=stolee@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox