development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-04 16:17:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

entry: refactor how we remove items for delayed checkouts

Browse source 
When finalizing a delayed checkout, we sort out several strings from the
passed-in string list by first assigning the empty string to those
filters and then calling `string_list_remove_empty_items()`. Assigning
the empty string will cause compiler warnings though as the string is
a `char *` once we enable `-Wwrite-strings`.

Refactor the code to use a `NULL` pointer with `filter_string_list()`
instead to avoid this warning.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-06-07 08:38:20 +02:00 committed by Junio C Hamano
parent 394affd46d
commit b31607a3e0
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
entry.c
View file

@ -167,6 +167,11 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)
return !available; return !available;
} }
static int string_is_not_null(struct string_list_item *item, void *data UNUSED)
{
return !!item->string;
}
int finish_delayed_checkout(struct checkout *state, int show_progress) int finish_delayed_checkout(struct checkout *state, int show_progress)
{ {
int errs = 0; int errs = 0;
@ -189,7 +194,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)
if (!async_query_available_blobs(filter->string, &available_paths)) { if (!async_query_available_blobs(filter->string, &available_paths)) {
/* Filter reported an error */ /* Filter reported an error */
errs = 1; errs = 1;
filter->string = ""; filter->string = NULL;
continue; continue;
} }
if (available_paths.nr <= 0) { if (available_paths.nr <= 0) {
@ -199,7 +204,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)
* filter from the list (see * filter from the list (see
* "string_list_remove_empty_items" call below). * "string_list_remove_empty_items" call below).
*/ */
filter->string = ""; filter->string = NULL;
continue; continue;
} }
@ -225,7 +230,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)
* Do not ask the filter for available blobs, * Do not ask the filter for available blobs,
* again, as the filter is likely buggy. * again, as the filter is likely buggy.
*/ */
filter->string = ""; filter->string = NULL;
continue; continue;
} }
ce = index_file_exists(state->istate, path->string, ce = index_file_exists(state->istate, path->string,
@ -239,7 +244,8 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)
errs = 1; errs = 1;
} }
} }
string_list_remove_empty_items(&dco->filters, 0);
filter_string_list(&dco->filters, 0, string_is_not_null, NULL);
} }
stop_progress(&progress); stop_progress(&progress);
string_list_clear(&dco->filters, 0); string_list_clear(&dco->filters, 0);