Re: [PATCH v2 1/2] [GSoC] diff: rename read_directory()
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 19, 2014, 08:12 UTC
- Message-ID
- <CAPig+cQ+9WNoNU54DHE-GnHQ=BCix9Efm+O_jP+a6mFL_yvmxg@mail.gmail.com>
- In-Reply-To
- <1395210578-1532-1-git-send-email-ba.bourn@gmail.com>
On Wed, Mar 19, 2014 at 2:29 AM, Brian Bourn <ba.bourn@gmail.com> wrote:
> Subject: diff: rename read_directory()
I think you mean "diff-no-index" rather than "diff".
> From: Brian Bourn <ba.bourn@gmail.com>
Unless this is intentionally different from the address from which you sent the email, you shouldn't include it here. "git am" will automatically pick up your name and address directly from the email header when applying your patch.
Show 6 quoted lines
> It is desirable to replace manual checking of "." or ".." > in diff-no-index.c with is_dot_or_dotdot(), which is defined > in dir.h. However, dir.h declares a read_directory which conflicts > with a (different) static read_directory() defined in > in diff-no-index.c. As a preparatory step, rename the local > read_directory() to avoid the collision
Better. Add a period at the end.
Other than these minor points, the patch looks good.
Show 33 quoted lines
> Signed-off-by: Brian Bourn <ba.bourn@gmail.com>
> ---
> Part 1 of my GSoC submission
> 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..ec51106 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 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;
> }
> --
> 1.9.0