[PATCH 3/6] pathspec: cache string length when initialize pathspec

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sep 19, 2010, 23:21 UTC
Message-ID: <1284938514-16663-4-git-send-email-pclouds@gmail.com>
In-Reply-To: <1284938514-16663-1-git-send-email-pclouds@gmail.com>

This field will be used when tree_entry_interesting() is converted to use struct pathspec. Currently it uses pathlens[] in struct diff_options to avoid calculating string over and over again.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 cache.h |    3 +++
 dir.c   |   11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/cache.h b/cache.h
index 6227ddb..045c9fc 100644
--- a/cache.h
+++ b/cache.h
@@ -495,6 +495,9 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
 struct pathspec {
 	const char **raw;
 	int nr;
+	struct pathspec_item {
+		int len;
+	} *items;
 };
 
 extern int init_pathspec(struct pathspec *,const char **);
diff --git a/dir.c b/dir.c
index 5815b64..80b2df2 100644
--- a/dir.c
+++ b/dir.c
@@ -1074,6 +1074,7 @@ int remove_path(const char *name)
 int init_pathspec(struct pathspec *pathspec, const char **paths)
 {
 	const char **p = paths;
+	int i;
 
 	memset(pathspec, 0, sizeof(*pathspec));
 	if (!p)
@@ -1082,10 +1083,18 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
 		p++;
 	pathspec->raw = paths;
 	pathspec->nr = p - paths;
+	if (!pathspec->nr)
+		return 0;
+
+	pathspec->items = xmalloc(sizeof(struct pathspec_item)*pathspec->nr);
+	for (i = 0; i < pathspec->nr; i++) {
+		pathspec->items[i].len = strlen(paths[i]);
+	}
 	return 0;
 }
 
 void free_pathspec(struct pathspec *pathspec)
 {
-	/* do nothing */
+	free(pathspec->items);
+	pathspec->items = NULL;
 }

-- 
1.7.1.rc1.70.g788ca