Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 19, 2014, 19:15 UTC
- Message-ID
- <CAPig+cSew=zjhC54w4LGipaXCD7+M=7pXShh6hoYBo_krRTkbg@mail.gmail.com>
- In-Reply-To
- <xmqqd2hi3ury.fsf@gitster.dls.corp.google.com>
On Wed, Mar 19, 2014 at 2:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 16 quoted lines
> Brian Bourn <ba.bourn@gmail.com> writes: > >> It would be 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 diff-no-index.c. As a preparatory step, rename the local >> read_directory() to avoid the collision. >> >> Signed-off-by: Brian Bourn <ba.bourn@gmail.com> >> --- >> Part 1 of my submission for GSoC >> diff-no-index.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > > Looks good to me. Doesn't Eric deserve a "Helped-by:" above?
Both patches look good to me too.
One final comment for future submissions (no need to resend this one): As a courtesy to reviewers, below the "---" line after your sign-off, provide a link to the previous attempt (like this [1]) and explain what changed since the since the last version.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/244412
Show 25 quoted lines
>> 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;
>> }