Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mar 19, 2014, 10:04 UTC
Message-ID: <CAPig+cR4564tsCO0U9HWNF9JZk64oFjx=nAWq+1QpGWSUn7Acg@mail.gmail.com>
In-Reply-To: <1395091825-8330-1-git-send-email-sh19910711@gmail.com>

On Mon, Mar 17, 2014 at 5:30 PM, Hiroyuki Sano <sh19910711@gmail.com> wrote:

> 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.

This explanation is slightly lacking. Since dir.h is not currently included by this file, a person reading this patch may wonder why you need to avoid conflict where there is none. Adding a short sentence saying that a subsequent patch will include dir.h in order to access is_dot_or_dotdot() can avoid such confusion.

Show 32 quoted lines

> 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)
>  {
>         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;
>                 }
> --
> 1.9.0