Skip to content

Commit 9daf0ef

Browse files
babourngitster
authored andcommitted
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>
1 parent 5f95c9f commit 9daf0ef

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

diff-no-index.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "builtin.h"
1717
#include "string-list.h"
1818

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)
2020
{
2121
DIR *dir;
2222
struct dirent *e;
@@ -107,9 +107,9 @@ static int queue_diff(struct diff_options *o,
107107
int i1, i2, ret = 0;
108108
size_t len1 = 0, len2 = 0;
109109

110-
if (name1 && read_directory(name1, &p1))
110+
if (name1 && read_directory_contents(name1, &p1))
111111
return -1;
112-
if (name2 && read_directory(name2, &p2)) {
112+
if (name2 && read_directory_contents(name2, &p2)) {
113113
string_list_clear(&p1, 0);
114114
return -1;
115115
}

0 commit comments

Comments
 (0)