From: Junio C Hamano Date: Mon, 27 Sep 2010 22:19:45 GMT Subject: Re: [PATCH 1/6] Add struct pathspec Message-ID: <7vbp7ix20u.fsf@alter.siamese.dyndns.org> In-Reply-To: <1284938514-16663-2-git-send-email-pclouds@gmail.com> Nguyễn Thái Ngọc Duy writes: > This struct for now is just a wrapper for the current pathspec form: > const char **. It is intended to be extended with more useful > pathspec-related information over time. > > The data structure for passing pathspec around remains const char **, > struct pathspec will be initialized locally to be used and destroyed. > Hopefully all pathspec related code will be gradually migrated to pass > this struct instead. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > cache.h | 7 +++++++ > dir.c | 18 ++++++++++++++++++ > 2 files changed, 25 insertions(+), 0 deletions(-) > > diff --git a/cache.h b/cache.h > index eb77e1d..6227ddb 100644 > --- a/cache.h > +++ b/cache.h > @@ -492,6 +492,13 @@ extern int index_name_is_oth > ... > +struct pathspec { > + const char **raw; > + int nr; > +}; > + > +extern int init_pathspec(struct pathspec *,const char **); s/,/, /; > +extern void free_pathspec(struct pathspec *); > extern int ce_path_match(const struct cache_entry *ce, const char **pathspec); > extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path); > extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); > diff --git a/dir.c b/dir.c > index 133f472..5815b64 100644 > --- a/dir.c > +++ b/dir.c > @@ -1071,3 +1071,21 @@ int remove_path(const char *name) > ... > +void free_pathspec(struct pathspec *pathspec) > +{ > + /* do nothing */ > +} I'd prefer making this more explicit by saying { ; /* do nothing */ }