From: Andrei Dinu <mandrei.dinu@gmail.com>
To: git@vger.kernel.org
Cc: Andrei Dinu <mandrei.dinu@gmail.com>
Subject: [PATCH] diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function.
Date: Wed, 19 Mar 2014 10:31:50 +0200 [thread overview]
Message-ID: <1395217910-7506-1-git-send-email-mandrei.dinu@gmail.com> (raw)
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@gmail.com>
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
next reply other threads:[~2014-03-19 8:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 8:31 Andrei Dinu [this message]
2014-03-19 9:51 ` [PATCH] diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function 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=1395217910-7506-1-git-send-email-mandrei.dinu@gmail.com \
--to=mandrei.dinu@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).