match_pathname(): drop unused "flags" parameter
This field has not been used since the function was introduced in b559263216 (exclude: split pathname matching code into a separate function, 2012-10-15), though there was a brief period where it was erroneously used and then reverted in ed4958477b (dir: fix pattern matching on dirs, 2021-09-24) and 5ceb663e92 (dir: fix directory-matching bug, 2021-11-02). It's possible we'd eventually add a flag that makes it useful here, but there are only a handful of callers. It would be easy to add back if necessary, and in the meantime this makes the function interface less misleading. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 19, 2022 at 04:50 UTC
77651c032c39897ebeba88649d966a9f732facd3
3 files changed
+4
-6
attr.c
+1
-1
@@ -1023,7 +1023,7 @@ static int path_matches(const char *pathname, int pathlen,
1023
}
1024
return match_pathname(pathname, pathlen - isdir,
1025
base, baselen,
1026
- pattern, prefix, pat->patternlen, pat->flags);
1026
+ pattern, prefix, pat->patternlen);
1027
}
1028
1029
static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem);
dir.c
+2
-4
@@ -1244,8 +1244,7 @@ int match_basename(const char *basename, int basenamelen,
1244
1245
int match_pathname(const char *pathname, int pathlen,
1246
const char *base, int baselen,
1247
- const char *pattern, int prefix, int patternlen,
1248
- unsigned flags)
1247
+ const char *pattern, int prefix, int patternlen)
1248
{
1249
const char *name;
1250
int namelen;
@@ -1347,8 +1346,7 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
1346
if (match_pathname(pathname, pathlen,
1347
pattern->base,
1348
pattern->baselen ? pattern->baselen - 1 : 0,
1350
- exclude, prefix, pattern->patternlen,
1351
- pattern->flags)) {
1349
+ exclude, prefix, pattern->patternlen)) {
1350
res = pattern;
1351
break;
1352
}
dir.h
+1
-1
@@ -414,7 +414,7 @@ int match_basename(const char *, int,
414
const char *, int, int, unsigned);
415
int match_pathname(const char *, int,
416
const char *, int,
417
- const char *, int, int, unsigned);
417
+ const char *, int, int);
418
419
struct path_pattern *last_matching_pattern(struct dir_struct *dir,
420
struct index_state *istate,