From: Collin Funk Date: Mon, 9 Mar 2026 03:23:06 +0000 (-0700) Subject: dir: avoid -Wdiscarded-qualifiers in remove_path() X-Git-Tag: v2.54.0-rc0~52^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02cbae61df7b3493e7f76f8385fc9257de60755f;p=thirdparty%2Fgit.git dir: avoid -Wdiscarded-qualifiers in remove_path() 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 its strdup'd copy. Signed-off-by: Collin Funk Signed-off-by: Junio C Hamano --- diff --git a/dir.c b/dir.c index b00821f294..046a8bbf32 100644 --- a/dir.c +++ b/dir.c @@ -3516,15 +3516,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 &&