[PATCH 1/2] diff-no-index.c: rename read_directory()
- From
- Andrei Dinu <mandrei.dinu@gmail.com>
- Date
- Mar 21, 2014, 18:56 UTC
- Message-ID
- <1395428217-7669-1-git-send-email-mandrei.dinu@gmail.com>
A subsequent patch will include dir.h in diff-no-index.c to access is_dot_or_dotdot(), however, dir.h declared a read_directory() which conflicts with a (different) read_directory() defined in diff-no-index.c. Rename read_directory() from diff-no-index.c to avoid the conflict.
Signed-off-by: Andrei Dinu <mandrei.dinu@gmail.com>
---
I plan on applying to GSoc 2014
I received your feedback and I resend the patches from the bug that I solved in the past
diff-no-index.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c index 8e10bff..5e4a76c 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_path(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_path(name1, &p1)) return -1; - if (name2 && read_directory(name2, &p2)) { + if (name2 && read_directory_path(name2, &p2)) { string_list_clear(&p1, 0); return -1; }
-- 1.7.9.5