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>
Michael Haggerty committed
Aug 12, 2011 at 23:43 UTC
4c7517c9cc7cfc7961a5c31d7539a71f35fae2c2
1 file changed
+4
-4
attr.c
+4
-4
@@ -140,7 +140,7 @@ struct match_attr {
140
static const char blank[] = " \t\r\n";
141
142
static const char *parse_attr(const char *src, int lineno, const char *cp,
143
- int *num_attr, struct match_attr *res)
143
+ int num_attr, struct match_attr *res)
144
{
145
const char *ep, *equals;
146
int len;
@@ -167,7 +167,7 @@ static const char *parse_attr(const char *src, int lineno, const char *cp,
167
} else {
168
struct attr_state *e;
169
170
- e = &(res->state[*num_attr]);
170
+ e = &(res->state[num_attr]);
171
if (*cp == '-' || *cp == '!') {
172
e->setto = (*cp == '-') ? ATTR__FALSE : ATTR__UNSET;
173
cp++;
@@ -180,7 +180,6 @@ static const char *parse_attr(const char *src, int lineno, const char *cp,
180
}
181
e->attr = git_attr_internal(cp, len);
182
}
183
- (*num_attr)++;
183
return ep + strspn(ep, blank);
184
}
185
@@ -226,9 +225,10 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
225
cp = name + namelen;
226
cp = cp + strspn(cp, blank);
227
while (*cp) {
229
- cp = parse_attr(src, lineno, cp, &num_attr, res);
228
+ cp = parse_attr(src, lineno, cp, num_attr, res);
229
if (!cp)
230
return NULL;
231
+ num_attr++;
232
}
233
if (pass)
234
break;