From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/6] attr: avoid strlen() on every match
Date: Thu, 4 Oct 2012 14:39:48 +0700 [thread overview]
Message-ID: <1349336392-1772-3-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1349336392-1772-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
attr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/attr.c b/attr.c
index 48df800..66b96d9 100644
--- a/attr.c
+++ b/attr.c
@@ -277,6 +277,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
static struct attr_stack {
struct attr_stack *prev;
char *origin;
+ size_t originlen;
unsigned num_matches;
unsigned alloc;
struct match_attr **attrs;
@@ -532,6 +533,7 @@ static void bootstrap_attr_stack(void)
if (!is_bare_repository() || direction == GIT_ATTR_INDEX) {
elem = read_attr(GITATTRIBUTES_FILE, 1);
elem->origin = xstrdup("");
+ elem->originlen = 0;
elem->prev = attr_stack;
attr_stack = elem;
debug_push(elem);
@@ -625,7 +627,7 @@ static void prepare_attr_stack(const char *path)
strbuf_addstr(&pathbuf, GITATTRIBUTES_FILE);
elem = read_attr(pathbuf.buf, 0);
strbuf_setlen(&pathbuf, cp - path);
- elem->origin = strbuf_detach(&pathbuf, NULL);
+ elem->origin = strbuf_detach(&pathbuf, &elem->originlen);
elem->prev = attr_stack;
attr_stack = elem;
debug_push(elem);
@@ -701,7 +703,7 @@ static int fill(const char *path, int pathlen, struct attr_stack *stk, int rem)
if (a->is_macro)
continue;
if (path_matches(path, pathlen,
- a->pattern, base, strlen(base)))
+ a->pattern, base, stk->originlen))
rem = fill_one("fill", a, rem);
}
return rem;
--
1.7.12.1.405.gb727dc9
next prev parent reply other threads:[~2012-10-04 22:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 23:20 What's cooking in git.git (Oct 2012, #01; Tue, 2) Junio C Hamano
2012-10-03 15:23 ` Nguyen Thai Ngoc Duy
2012-10-03 18:17 ` Junio C Hamano
2012-10-04 1:56 ` Nguyen Thai Ngoc Duy
2012-10-04 6:01 ` Junio C Hamano
2012-10-04 7:39 ` [PATCH 0/6] wildmatch part 2 Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 1/6] attr: remove the union in struct match_attr Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` Nguyễn Thái Ngọc Duy [this message]
2012-10-04 7:39 ` [PATCH 3/6] attr: avoid searching for basename on every match Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 4/6] attr: more matching optimizations from .gitignore Nguyễn Thái Ngọc Duy
2012-10-04 7:39 ` [PATCH 5/6] gitignore: do not do basename match with patterns that have '**' Nguyễn Thái Ngọc Duy
2012-10-04 17:59 ` Junio C Hamano
2012-10-05 7:01 ` Johannes Sixt
2012-10-05 11:23 ` Nguyen Thai Ngoc Duy
2012-10-04 7:39 ` [PATCH 6/6] t3001: note about expected "**" behavior Nguyễn Thái Ngọc Duy
2012-10-04 18:04 ` Junio C Hamano
2012-10-04 17:43 ` [PATCH 0/6] wildmatch part 2 Junio C Hamano
2012-10-04 9:34 ` What's cooking in git.git (Oct 2012, #01; Tue, 2) Michael Haggerty
2012-10-04 11:46 ` Nguyen Thai Ngoc Duy
2012-10-04 15:17 ` Michael Haggerty
2012-10-04 16:39 ` Junio C Hamano
2012-10-05 12:19 ` Andreas Schwab
2012-10-05 12:30 ` Matthieu Moy
2012-10-05 14:15 ` Andreas Schwab
2012-10-05 13:21 ` Nguyen Thai Ngoc Duy
2012-10-04 8:17 ` David Michael Barr
2012-10-04 8:30 ` fa/remote-svn (Re: What's cooking in git.git (Oct 2012, #01; Tue, 2)) Jonathan Nieder
2012-10-04 13:16 ` Stephen Bash
2012-10-04 16:30 ` Junio C Hamano
2012-10-04 16:27 ` What's cooking in git.git (Oct 2012, #01; Tue, 2) Junio C Hamano
2012-10-30 12:15 ` Florian Achleitner
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=1349336392-1772-3-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).