git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-24 22:42:16 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

hook: move unsorted_string_list_remove() to string-list.[ch]

Browse Source 
Move the convenience wrapper from hook to string-list since
it's a more suitable place. Add a doc comment to the header.

Also add a free_util arg to make the function more generic
and make the API similar to other functions in string-list.h.
Update the existing call-sites.

Suggested-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adrian Ratiu
2026-03-25 21:54:52 +02:00
committed by Junio C Hamano
parent 83677335ae
commit add3564d2f
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hook.c
View File

@@ -110,14 +110,6 @@ static void list_hooks_add_default(struct repository *r, const char *hookname,
string_list_append(hook_list, hook_path)->util = h;
}
static void unsorted_string_list_remove(struct string_list *list,
const char *str)
{
struct string_list_item *item = unsorted_string_list_lookup(list, str);
if (item)
unsorted_string_list_delete_item(list, item - list->items, 0);
}
/*
* Callback struct to collect all hook.* keys in a single config pass.
* commands: friendly-name to command map.
@@ -156,7 +148,7 @@ static int hook_config_lookup_all(const char *key, const char *value,
struct strmap_entry *e;
strmap_for_each_entry(&data->event_hooks, &iter, e)
unsorted_string_list_remove(e->value, hook_name);
unsorted_string_list_remove(e->value, hook_name, 0);
} else {
struct string_list *hooks =
strmap_get(&data->event_hooks, value);
@@ -168,7 +160,7 @@ static int hook_config_lookup_all(const char *key, const char *value,
}
/* Re-insert if necessary to preserve last-seen order. */
unsorted_string_list_remove(hooks, hook_name);
unsorted_string_list_remove(hooks, hook_name, 0);
string_list_append(hooks, hook_name);
}
} else if (!strcmp(subkey, "command")) {
@@ -186,7 +178,7 @@ static int hook_config_lookup_all(const char *key, const char *value,
break;
case 1: /* enabled: undo a prior disabled entry */
unsorted_string_list_remove(&data->disabled_hooks,
hook_name);
hook_name, 0);
break;
default:
break; /* ignore unrecognised values */

9
string-list.c
View File

@@ -281,6 +281,15 @@ void unsorted_string_list_delete_item(struct string_list *list, int i, int free_
list->nr--;
}
void unsorted_string_list_remove(struct string_list *list, const char *str,
int free_util)
{
struct string_list_item *item = unsorted_string_list_lookup(list, str);
if (item)
unsorted_string_list_delete_item(list, item - list->items,
free_util);
}
/*
* append a substring [p..end] to list; return number of things it
* appended to the list.

8
string-list.h
View File

@@ -265,6 +265,14 @@ struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
*/
void unsorted_string_list_delete_item(struct string_list *list, int i, int free_util);
/**
* Remove the first item matching `str` from an unsorted string_list.
* No-op if `str` is not found. If `free_util` is non-zero, the `util`
* pointer of the removed item is freed before deletion.
*/
void unsorted_string_list_remove(struct string_list *list, const char *str,
int free_util);
/**
* Split string into substrings on characters in `delim` and append the
* substrings to `list`. The input string is not modified.