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>
Brian Bourn committed
Mar 19, 2014 at 11:58 UTC
9daf0ef065bfef4fb9dcc1710a39a8177695c84f
1 file changed
+3
-3
diff-no-index.c
+3
-3
@@ -16,7 +16,7 @@
16
#include "builtin.h"
17
#include "string-list.h"
18
19
-static int read_directory(const char *path, struct string_list *list)
19
+static int read_directory_contents(const char *path, struct string_list *list)
20
{
21
DIR *dir;
22
struct dirent *e;
@@ -107,9 +107,9 @@ static int queue_diff(struct diff_options *o,
107
int i1, i2, ret = 0;
108
size_t len1 = 0, len2 = 0;
109
110
- if (name1 && read_directory(name1, &p1))
110
+ if (name1 && read_directory_contents(name1, &p1))
111
return -1;
112
- if (name2 && read_directory(name2, &p2)) {
112
+ if (name2 && read_directory_contents(name2, &p2)) {
113
string_list_clear(&p1, 0);
114
return -1;
115
}