[PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

[PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

[Brian Bourn]

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(-)

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

[PATCH v3 2/2][GSoC] diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()

[Brian Bourn]

Signed-off-by: Brian Bourn <ba.bourn@gmail.com>
---
Part 2 of my submission for GSoC
 diff-no-index.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/diff-no-index.c b/diff-no-index.c
index ec51106..c554691 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -15,6 +15,7 @@
 #include "log-tree.h"
 #include "builtin.h"
 #include "string-list.h"
+#include "dir.h"
 
 static int read_directory_contents(const char *path, struct string_list *list)
 {
@@ -25,7 +26,7 @@ static int read_directory_contents(const char *path, struct string_list *list)
 		return error("Could not open directory %s", path);
 
 	while ((e = readdir(dir)))
-		if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
+		if (!is_dot_or_dotdot(e->d_name))
 			string_list_insert(list, e->d_name);
 
 	closedir(dir);
-- 
1.9.0

Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

[Junio C Hamano]

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?

Thanks.

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

Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

[Eric Sunshine]

On Wed, Mar 19, 2014 at 2:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> 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

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