Skip to content

Commit ac14aa5

Browse files
collinfunkgitster
authored andcommitted
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 it's strdup'd copy. Signed-off-by: Collin Funk <collin.funk1@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1ac1d4e commit ac14aa5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

dir.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3516,15 +3516,15 @@ int get_sparse_checkout_patterns(struct pattern_list *pl)
35163516

35173517
int remove_path(const char *name)
35183518
{
3519-
char *slash;
3519+
const char *last;
35203520

35213521
if (unlink(name) && !is_missing_file_error(errno))
35223522
return -1;
35233523

3524-
slash = strrchr(name, '/');
3525-
if (slash) {
3524+
last = strrchr(name, '/');
3525+
if (last) {
35263526
char *dirs = xstrdup(name);
3527-
slash = dirs + (slash - name);
3527+
char *slash = dirs + (last - name);
35283528
do {
35293529
*slash = '\0';
35303530
if (startup_info->original_cwd &&

0 commit comments

Comments
 (0)