summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 18:38:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-06 18:38:59 (GMT)
commit12508a83549e59f0160ada423997069bf4a4003f (patch)
tree97be7bcf3625b3f1a12d326a3d7aa3c57ab9b2d3 /dir.c
parent6a269e52a5d0c82567c5b39cc194cc90f9fa9156 (diff)
parentf870899864e077a54776af838c6476d5850cfaaf (diff)
downloadgit-12508a83549e59f0160ada423997069bf4a4003f.zip
git-12508a83549e59f0160ada423997069bf4a4003f.tar.gz
git-12508a83549e59f0160ada423997069bf4a4003f.tar.bz2
Merge branch 'ss/exc-flag-is-a-collection-of-bits'
Code clean-up. * ss/exc-flag-is-a-collection-of-bits: dir: store EXC_FLAG_* values in unsigned integers
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dir.c b/dir.c
index a4a9d9f..996653b 100644
--- a/dir.c
+++ b/dir.c
@@ -457,7 +457,7 @@ int no_wildcard(const char *string)
void parse_exclude_pattern(const char **pattern,
int *patternlen,
- int *flags,
+ unsigned *flags,
int *nowildcardlen)
{
const char *p = *pattern;
@@ -498,7 +498,7 @@ void add_exclude(const char *string, const char *base,
{
struct exclude *x;
int patternlen;
- int flags;
+ unsigned flags;
int nowildcardlen;
parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
@@ -798,7 +798,7 @@ void add_excludes_from_file(struct dir_struct *dir, const char *fname)
int match_basename(const char *basename, int basenamelen,
const char *pattern, int prefix, int patternlen,
- int flags)
+ unsigned flags)
{
if (prefix == patternlen) {
if (patternlen == basenamelen &&
@@ -823,7 +823,7 @@ int match_basename(const char *basename, int basenamelen,
int match_pathname(const char *pathname, int pathlen,
const char *base, int baselen,
const char *pattern, int prefix, int patternlen,
- int flags)
+ unsigned flags)
{
const char *name;
int namelen;