[PATCH] diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



is_dot_or_dotdot() verifies if the name of the directory sent as parameter to this function is the same with '.' or '..' and returns 0 if that is true.

There is unnecessary to iterate each character of the char* argument and verify it with strcmp because if there is a match that is at the beginning of chars.

Signed-off-by: Andrei Dinu <mandrei.dinu@xxxxxxxxx>

I plan on applying to GSoc 2014
---
 diff-no-index.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/diff-no-index.c b/diff-no-index.c
index 8e10bff..83cdbf7 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -16,6 +16,15 @@
 #include "builtin.h"
 #include "string-list.h"
 
+static int is_dot_or_dotdot(const char *path)
+{
+    if (path[0] == '.' && path[1] == '\0')
+        return 0;
+    else if (path[0] == '.' && path[1] == '.' && path[2] == '\0')
+        return 0;
+    return 1;
+}
+
 static int read_directory(const char *path, struct string_list *list)
 {
 	DIR *dir;
@@ -25,7 +34,7 @@ static int read_directory(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.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]