undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-no-index: rename read_directory()

Browse Source 
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>
This commit is contained in:
Brian Bourn 2014-03-19 11:58:21 -04:00 committed by Junio C Hamano
parent 5f95c9f850
commit 9daf0ef065
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff-no-index.c
View File

@ -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;
}