From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Mar 2014 22:37:18 GMT
Subject: Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()
Message-ID: <xmqqy508a1up.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1395091825-8330-1-git-send-email-sh19910711@gmail.com>

Hiroyuki Sano <sh19910711@gmail.com> writes:

> Including "dir.h" in "diff-no-index.c", it causes a compile error, because
> the same name function read_directory() is declared globally in "dir.h".
>
> This change is to avoid conflicts as above.
>
> Signed-off-by: Hiroyuki Sano <sh19910711@gmail.com>
> ---
>  diff-no-index.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/diff-no-index.c b/diff-no-index.c
> index 8e10bff..1ed5c9d 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 get_directory_list(const char *path, struct string_list *list)

Renaming is a good idea but the new name sounds like you are
grabbing the names of directories, ignoring all the files, no?

>  {
>  	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 && get_directory_list(name1, &p1))
>  			return -1;
> -		if (name2 && read_directory(name2, &p2)) {
> +		if (name2 && get_directory_list(name2, &p2)) {
>  			string_list_clear(&p1, 0);
>  			return -1;
>  		}