From: Junio C Hamano Date: Wed, 21 Sep 2016 22:15:22 +0000 (-0700) Subject: Merge branch 'bw/pathspec-remove-unused-extern-decl' X-Git-Tag: v2.11.0-rc0~133 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/570b4494c7c331bf77ce3a11122993a656901f4a?hp=-c Merge branch 'bw/pathspec-remove-unused-extern-decl' Code cleanup. * bw/pathspec-remove-unused-extern-decl: pathspec: remove unnecessary function prototypes --- 570b4494c7c331bf77ce3a11122993a656901f4a diff --combined pathspec.h index 4a80f6fc96,08f5876f02..59809e4793 --- a/pathspec.h +++ b/pathspec.h @@@ -19,7 -19,7 +19,7 @@@ #define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */ struct pathspec { - const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */ + const char **_raw; /* get_pathspec() result, not freed by clear_pathspec() */ int nr; unsigned int has_wildcard:1; unsigned int recursive:1; @@@ -74,7 -74,7 +74,7 @@@ extern void parse_pathspec(struct paths const char *prefix, const char **args); extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src); -extern void free_pathspec(struct pathspec *); +extern void clear_pathspec(struct pathspec *); static inline int ps_strncmp(const struct pathspec_item *item, const char *s1, const char *s2, size_t n) @@@ -96,7 -96,5 +96,5 @@@ static inline int ps_strcmp(const struc extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec); extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen); - extern const char *check_path_for_gitlink(const char *path); - extern void die_if_path_beyond_symlink(const char *path, const char *prefix); #endif /* PATHSPEC_H */