Skip to content

Commit

Permalink
dir.h: move struct exclude declaration to top level
Browse files Browse the repository at this point in the history
There is no actual nested struct here. Move it out for clarity.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Jul 14, 2014
1 parent d961baa commit 709359c
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions dir.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,27 @@ struct dir_entry {
#define EXC_FLAG_MUSTBEDIR 8
#define EXC_FLAG_NEGATIVE 16

struct exclude {
/*
* This allows callers of last_exclude_matching() etc.
* to determine the origin of the matching pattern.
*/
struct exclude_list *el;

const char *pattern;
int patternlen;
int nowildcardlen;
const char *base;
int baselen;
int flags;

/*
* Counting starts from 1 for line numbers in ignore files,
* and from -1 decrementing for patterns from CLI args.
*/
int srcpos;
};

/*
* Each excludes file will be parsed into a fresh exclude_list which
* is appended to the relevant exclude_list_group (either EXC_DIRS or
Expand All @@ -32,26 +53,7 @@ struct exclude_list {
/* origin of list, e.g. path to filename, or descriptive string */
const char *src;

struct exclude {
/*
* This allows callers of last_exclude_matching() etc.
* to determine the origin of the matching pattern.
*/
struct exclude_list *el;

const char *pattern;
int patternlen;
int nowildcardlen;
const char *base;
int baselen;
int flags;

/*
* Counting starts from 1 for line numbers in ignore files,
* and from -1 decrementing for patterns from CLI args.
*/
int srcpos;
} **excludes;
struct exclude **excludes;
};

/*
Expand Down

0 comments on commit 709359c

Please sign in to comment.