From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 09/23] Teach prepare_attr_stack() to figure out dirlen itself
Date: Thu, 4 Aug 2011 06:36:19 +0200 [thread overview]
Message-ID: <1312432593-9841-10-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1312432593-9841-1-git-send-email-mhagger@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
attr.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/attr.c b/attr.c
index bfa1f43..7f0f390 100644
--- a/attr.c
+++ b/attr.c
@@ -535,11 +535,18 @@ static void bootstrap_attr_stack(void)
}
}
-static void prepare_attr_stack(const char *path, int dirlen)
+static void prepare_attr_stack(const char *path)
{
struct attr_stack *elem, *info;
- int len;
+ int dirlen, len;
struct strbuf pathbuf;
+ const char *cp;
+
+ cp = strrchr(path, '/');
+ if (!cp)
+ dirlen = 0;
+ else
+ dirlen = cp - path;
strbuf_init(&pathbuf, dirlen+2+strlen(GITATTRIBUTES_FILE));
@@ -709,20 +716,14 @@ static int macroexpand_one(int attr_nr, int rem)
int git_checkattr(const char *path, int num, struct git_attr_check *check)
{
struct attr_stack *stk;
- const char *cp;
- int dirlen, pathlen, i, rem;
+ int pathlen, i, rem;
bootstrap_attr_stack();
for (i = 0; i < attr_nr; i++)
check_all_attr[i].value = ATTR__UNKNOWN;
pathlen = strlen(path);
- cp = strrchr(path, '/');
- if (!cp)
- dirlen = 0;
- else
- dirlen = cp - path;
- prepare_attr_stack(path, dirlen);
+ prepare_attr_stack(path);
rem = attr_nr;
for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
rem = fill(path, pathlen, stk, rem);
--
1.7.6.8.gd2879
next prev parent reply other threads:[~2011-08-04 4:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 4:36 [PATCH v3 00/23] Add --all option to git-check-attr Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 01/23] doc: Add a link from gitattributes(5) to git-check-attr(1) Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 02/23] doc: Correct git_attr() calls in example code Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 03/23] Remove anachronism from comment Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 04/23] Disallow the empty string as an attribute name Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 05/23] git-check-attr: Add missing "&&" Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 06/23] git-check-attr: Add tests of command-line parsing Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 07/23] Provide access to the name attribute of git_attr Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 08/23] git-check-attr: Use git_attr_name() Michael Haggerty
2011-08-04 4:36 ` Michael Haggerty [this message]
2011-08-04 4:36 ` [PATCH v3 10/23] Extract a function collect_all_attrs() Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 11/23] Remove redundant call to bootstrap_attr_stack() Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 12/23] Remove redundant check Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 13/23] Allow querying all attributes on a file Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 14/23] git-check-attr: Extract a function output_attr() Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 15/23] git-check-attr: Introduce a new variable Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 16/23] git-check-attr: Extract a function error_with_usage() Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 17/23] git-check-attr: Handle each error separately Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 18/23] git-check-attr: Process command-line args more systematically Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 19/23] git-check-attr: Error out if no pathnames are specified Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 20/23] git-check-attr: Add an --all option to show all attributes Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 21/23] git-check-attr: Drive two tests using the same raw data Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 22/23] git-check-attr: Fix command-line handling to match docs Michael Haggerty
2011-08-04 4:36 ` [PATCH v3 23/23] Rename git_checkattr() to git_check_attr() Michael Haggerty
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312432593-9841-10-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).