Implement read_directory() to use is_dot_or_dotdot() function from dir.h instead of strcmp().
Rename read_directory() in read_directory_path() to avoid conflicting with read_directory() from dir.h.
Signed-off-by: Andrei Dinu <mandrei.dinu@gmail.com>
--- I plan on applying to GSoc 2014.
diff-no-index.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Show changes to diff-no-index.c +5 −4
diff --git a/diff-no-index.c b/diff-no-index.c index 8e10bff..2d1165f 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -15,8 +15,9 @@ #include "log-tree.h" #include "builtin.h" #include "string-list.h" +#include "dir.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; @@ -25,7 +26,7 @@ static int read_directory(const char *path, struct string_list *list) return error("Could not open directory %s", path); while ((e = readdir(dir))) - if (strcmp(".", e->d_name) && strcmp("..", e->d_name)) + if (!is_dot_or_dotdot(e->d_name)) string_list_insert(list, e->d_name); closedir(dir); @@ -107,9 +108,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
