entry_matches(): inline function
It wasn't pulling its weight. And in a moment we will need similar tests that take a refname rather than a ref_entry as parameter, which would have made entry_matches() even less useful. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Michael Haggerty committed
May 11, 2015 at 17:25 UTC
8bfac19ab4844a63e2f660fcaf4fec4fbe08e47f
1 file changed
+2
-7
refs.c
+2
-7
@@ -841,11 +841,6 @@ static void prime_ref_dir(struct ref_dir *dir)
841
}
842
}
843
844
-static int entry_matches(struct ref_entry *entry, const struct string_list *list)
845
-{
846
- return list && string_list_has_string(list, entry->name);
847
-}
848
-
844
struct nonmatching_ref_data {
845
const struct string_list *skip;
846
struct ref_entry *found;
@@ -855,7 +850,7 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata)
850
{
851
struct nonmatching_ref_data *data = vdata;
852
858
- if (entry_matches(entry, data->skip))
853
+ if (data->skip && string_list_has_string(data->skip, entry->name))
854
return 0;
855
856
data->found = entry;
@@ -908,7 +903,7 @@ static int is_refname_available(const char *refname,
903
* prefix of refname; e.g., "refs/foo".
904
*/
905
struct ref_entry *entry = dir->entries[pos];
911
- if (entry_matches(entry, skip)) {
906
+ if (skip && string_list_has_string(skip, entry->name)) {
907
/*
908
* The reference we just found, e.g.,
909
* "refs/foo", is also in skip, so it