summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-14 18:37:15 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-14 18:37:15 -0700
commit9fabc7083275f455ef21123cbdcbdd31b21a8251 (patch)
tree14f05d7d29b5262ad1702e2de2dd6e323cb029e2 /dir.h
parente0735442eee5af8c3f50b3e2d820fa9e4c4a1c53 (diff)
parentf870899864e077a54776af838c6476d5850cfaaf (diff)
downloadgit-9fabc7083275f455ef21123cbdcbdd31b21a8251.tar.gz
Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint
Code clean-up. * ss/exc-flag-is-a-collection-of-bits: dir: store EXC_FLAG_* values in unsigned integers
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/dir.h b/dir.h
index cd46f30017..301b737a37 100644
--- a/dir.h
+++ b/dir.h
@@ -27,7 +27,7 @@ struct exclude {
int nowildcardlen;
const char *base;
int baselen;
- int flags;
+ unsigned flags; /* EXC_FLAG_* */
/*
* Counting starts from 1 for line numbers in ignore files,
@@ -226,10 +226,10 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname,
* attr.c:path_matches()
*/
extern int match_basename(const char *, int,
- const char *, int, int, int);
+ const char *, int, int, unsigned);
extern int match_pathname(const char *, int,
const char *, int,
- const char *, int, int, int);
+ const char *, int, int, unsigned);
extern struct exclude *last_exclude_matching(struct dir_struct *dir,
const char *name, int *dtype);
@@ -241,7 +241,7 @@ extern struct exclude_list *add_exclude_list(struct dir_struct *dir,
extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
struct exclude_list *el, int check_index);
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
-extern void parse_exclude_pattern(const char **string, int *patternlen, int *flags, int *nowildcardlen);
+extern void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
extern void add_exclude(const char *string, const char *base,
int baselen, struct exclude_list *el, int srcpos);
extern void clear_exclude_list(struct exclude_list *el);