summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-06-22 21:38:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 01:27:07 (GMT)
commit55d3426929d4d8c3dec402cabe6fb1bf27d6abad (patch)
tree1b037524961e2fc22f891e0e2c2a5dde72f8c0df /dir.c
parent5402b1352f5181247405fbff1887008a0cb3b04a (diff)
downloadgit-55d3426929d4d8c3dec402cabe6fb1bf27d6abad.zip
git-55d3426929d4d8c3dec402cabe6fb1bf27d6abad.tar.gz
git-55d3426929d4d8c3dec402cabe6fb1bf27d6abad.tar.bz2
wildmatch: remove unused wildopts parameter
Remove the unused wildopts placeholder struct from being passed to all wildmatch() invocations, or rather remove all the boilerplate NULL parameters. This parameter was added back in commit 9b3497cab9 ("wildmatch: rename constants and update prototype", 2013-01-01) as a placeholder for future use. Over 4 years later nothing has made use of it, let's just remove it. It can be added in the future if we find some reason to start using such a parameter. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/dir.c b/dir.c
index 5f1afb5..c64965f 100644
--- a/dir.c
+++ b/dir.c
@@ -91,13 +91,11 @@ int git_fnmatch(const struct pathspec_item *item,
if (item->magic & PATHSPEC_GLOB)
return wildmatch(pattern, string,
WM_PATHNAME |
- (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0),
- NULL);
+ (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0));
else
/* wildmatch has not learned no FNM_PATHNAME mode yet */
return wildmatch(pattern, string,
- item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0,
- NULL);
+ item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0);
}
static int fnmatch_icase_mem(const char *pattern, int patternlen,
@@ -121,7 +119,7 @@ static int fnmatch_icase_mem(const char *pattern, int patternlen,
if (ignore_case)
flags |= WM_CASEFOLD;
- match_status = wildmatch(use_pat, use_str, flags, NULL);
+ match_status = wildmatch(use_pat, use_str, flags);
strbuf_release(&pat_buf);
strbuf_release(&str_buf);