summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-14 20:22:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-09 08:11:26 (GMT)
commit1d8842d921cc2695f155f4a10904eeffad085c77 (patch)
tree87186d8b5c8116ec5b442c6f401c2c3a6729de53 /dir.h
parentf581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4 (diff)
downloadgit-1d8842d921cc2695f155f4a10904eeffad085c77.zip
git-1d8842d921cc2695f155f4a10904eeffad085c77.tar.gz
git-1d8842d921cc2695f155f4a10904eeffad085c77.tar.bz2
Add 'fill_directory()' helper function for directory traversal
Most of the users of "read_directory()" actually want a much simpler interface than the whole complex (but rather powerful) one. In fact 'git add' had already largely abstracted out the core interface issues into a private "fill_directory()" function that was largely applicable almost as-is to a number of callers. Yes, 'git add' wants to do some extra work of its own, specific to the add semantics, but we can easily split that out, and use the core as a generic function. This function does exactly that, and now that much simplified 'fill_directory()' function can be shared with a number of callers, while also ensuring that the rather more complex calling conventions of read_directory() are used by fewer call-sites. This also makes the 'common_prefix()' helper function private to dir.c, since all callers are now in that file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/dir.h b/dir.h
index 541286a..f9d69dd 100644
--- a/dir.h
+++ b/dir.h
@@ -61,13 +61,12 @@ struct dir_struct {
char basebuf[PATH_MAX];
};
-extern int common_prefix(const char **pathspec);
-
#define MATCHED_RECURSIVELY 1
#define MATCHED_FNMATCH 2
#define MATCHED_EXACTLY 3
extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
+extern int fill_directory(struct dir_struct *dir, const char **pathspec);
extern int read_directory(struct dir_struct *, const char *path, const char *base, int baselen, const char **pathspec);
extern int excluded(struct dir_struct *, const char *, int *);