diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-08-12 23:43:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 15:01:58 -0700 |
| commit | 4c7517c9cc7cfc7961a5c31d7539a71f35fae2c2 (patch) | |
| tree | 20ba9e36433c54f189302009cae318a60e0a79fb /attr.c | |
| parent | ba845b755078a043312119609c1ddd7406b20979 (diff) | |
| download | git-4c7517c9cc7cfc7961a5c31d7539a71f35fae2c2.tar.gz | |
Increment num_attr in parse_attr_line(), not parse_attr()
num_attr is incremented iff parse_attr() returns non-NULL. So do the
counting in parse_attr_line() instead of within parse_attr(). This
allows an integer rather than a pointer to an integer to be passed to
parse_attr().
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
| -rw-r--r-- | attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -140,7 +140,7 @@ struct match_attr { static const char blank[] = " \t\r\n"; static const char *parse_attr(const char *src, int lineno, const char *cp, - int *num_attr, struct match_attr *res) + int num_attr, struct match_attr *res) { const char *ep, *equals; int len; @@ -167,7 +167,7 @@ static const char *parse_attr(const char *src, int lineno, const char *cp, } else { struct attr_state *e; - e = &(res->state[*num_attr]); + e = &(res->state[num_attr]); if (*cp == '-' || *cp == '!') { e->setto = (*cp == '-') ? ATTR__FALSE : ATTR__UNSET; cp++; @@ -180,7 +180,6 @@ static const char *parse_attr(const char *src, int lineno, const char *cp, } e->attr = git_attr_internal(cp, len); } - (*num_attr)++; return ep + strspn(ep, blank); } @@ -226,9 +225,10 @@ static struct match_attr *parse_attr_line(const char *line, const char *src, cp = name + namelen; cp = cp + strspn(cp, blank); while (*cp) { - cp = parse_attr(src, lineno, cp, &num_attr, res); + cp = parse_attr(src, lineno, cp, num_attr, res); if (!cp) return NULL; + num_attr++; } if (pass) break; |