From: Nguyễn Thái Ngọc Duy Date: Tue, 07 Sep 2010 15:47:59 GMT Subject: [PATCH 1/5] diff-no-index.c: rename read_directory() to read_dir() Message-ID: <1283874483-32017-2-git-send-email-pclouds@gmail.com> In-Reply-To: <1283874483-32017-1-git-send-email-pclouds@gmail.com> This name clashes with one in dir.h, to be included later on. Signed-off-by: Nguyễn Thái Ngọc Duy --- diff-no-index.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index ce9e783..859a8ba 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_dir(const char *path, struct string_list *list) { DIR *dir; struct dirent *e; @@ -68,9 +68,9 @@ static int queue_diff(struct diff_options *o, struct string_list p2 = STRING_LIST_INIT_DUP; int len1 = 0, len2 = 0, i1, i2, ret = 0; - if (name1 && read_directory(name1, &p1)) + if (name1 && read_dir(name1, &p1)) return -1; - if (name2 && read_directory(name2, &p2)) { + if (name2 && read_dir(name2, &p2)) { string_list_clear(&p1, 0); return -1; } -- 1.7.1.rc1.69.g24c2f7