summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorBrian Bourn <ba.bourn@gmail.com>2014-03-19 11:58:21 -0400
committerJunio C Hamano <gitster@pobox.com>2014-03-19 11:49:35 -0700
commit9daf0ef065bfef4fb9dcc1710a39a8177695c84f (patch)
treefa0d1d13391c08fc0c482a3f6e4a4e05b0a8b62a /diff-no-index.c
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff)
downloadgit-9daf0ef065bfef4fb9dcc1710a39a8177695c84f.tar.gz
diff-no-index: rename read_directory()
In the next patch, we will replace a manual checking of "." or ".." with a call to is_dot_or_dotdot() defined in dir.h. The private function read_directory() defined in this file will conflict with the global function declared there when we do so. As a preparatory step, rename the private read_directory() to avoid the name collision. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Brian Bourn <ba.bourn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
-rw-r--r--diff-no-index.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index 33e5982a1c..3e4f47e1d8 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;
}