X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=attr.c;h=55bdb7cdebea7f7ea551231fe7801f272d128d69;hb=46068383aa825dfe9026f9255cea07da07e06253;hp=f1ca4f58599c14c98473f3638a3d0d6eed2aafaa;hpb=75b44066f3ed7cde238cdea1f0bf9e2f1744c820;p=git.git diff --git a/attr.c b/attr.c index f1ca4f585..55bdb7cde 100644 --- a/attr.c +++ b/attr.c @@ -35,8 +35,7 @@ static struct git_attr *(git_attr_hash[HASHSIZE]); static unsigned hash_name(const char *name, int namelen) { - unsigned val = 0; - unsigned char c; + unsigned val = 0, c; while (namelen--) { c = *name++; @@ -224,7 +223,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src, if (is_macro) res->u.attr = git_attr(name, namelen); else { - res->u.pattern = (char*)&(res->state[num_attr]); + res->u.pattern = (char *)&(res->state[num_attr]); memcpy(res->u.pattern, name, namelen); res->u.pattern[namelen] = 0; } @@ -275,7 +274,7 @@ static void free_attr_elem(struct attr_stack *e) setto == ATTR__UNKNOWN) ; else - free((char*) setto); + free((char *) setto); } free(a); } @@ -556,6 +555,8 @@ static void prepare_attr_stack(const char *path, int dirlen) } } + strbuf_release(&pathbuf); + /* * Finally push the "info" one at the top of the stack. */