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 <collin.funk1@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index b00821f294fea2fdd74a41d7e82a6b5aaa62a66c..046a8bbf325ac56306dd37dababa2d27866e0247 100644 (file)
--- 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 &&