Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:00:23
Brian Bourn [off-list ref] writes:
It would be desirable to replace manual checking of "." or ".." in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h, however, dir.h declares a read_directory() which conflicts with a (different) static read_directory() defined in diff-no-index.c. As a preparatory step, rename the local read_directory() to avoid the collision. Signed-off-by: Brian Bourn <redacted> --- Part 1 of my submission for GSoC diff-no-index.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Looks good to me. Doesn't Eric deserve a "Helped-by:" above? Thanks.
quoted hunk
diff --git a/diff-no-index.c b/diff-no-index.c index 8e10bff..ec51106 100644 --- a/diff-no-index.c +++ b/diff-no-index.c@@ -16,7 +16,7 @@ #include "builtin.h" #include "string-list.h" -static int read_directory(const char *path, struct string_list *list) +static int read_directory_contents(const char *path, struct string_list *list) { DIR *dir; struct dirent *e;@@ -107,9 +107,9 @@ static int queue_diff(struct diff_options *o, int i1, i2, ret = 0; size_t len1 = 0, len2 = 0; - if (name1 && read_directory(name1, &p1)) + if (name1 && read_directory_contents(name1, &p1)) return -1; - if (name2 && read_directory(name2, &p2)) { + if (name2 && read_directory_contents(name2, &p2)) { string_list_clear(&p1, 0); return -1; }