public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Hiroyuki Sano <sh19910711@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()
Date: Mon, 17 Mar 2014 15:37:18 -0700	[thread overview]
Message-ID: <xmqqy508a1up.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1395091825-8330-1-git-send-email-sh19910711@gmail.com> (Hiroyuki Sano's message of "Tue, 18 Mar 2014 06:30:23 +0900")

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

next prev parent reply	other threads:[~2014-03-17 22:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-17 21:30 [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list() Hiroyuki Sano
2014-03-17 21:30 ` [PATCH 2/3][GSOC] diff: use is_dot_or_dotdot() instead of strcmp() Hiroyuki Sano
2014-03-17 21:30 ` [PATCH 3/3][GSOC] fsck: " Hiroyuki Sano
2014-03-17 22:39   ` Junio C Hamano
2014-03-17 22:37 ` Junio C Hamano [this message]
2014-03-19 17:22   ` [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list() Junio C Hamano
2014-03-19 18:48     ` Junio C Hamano
2014-03-19 10:04 ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqy508a1up.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sh19910711@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox