undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref-filter: use string_list_split over strbuf_split

Browse Source 
We don't do any post-processing on the resulting strbufs, so it is
simpler to just use string_list_split, which takes care of removing
the delimiter for us.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2016-02-17 23:36:09 +05:30 committed by Junio C Hamano
parent 0571979bd6
commit 132676478c
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ref-filter.c
View File

@ -886,41 +886,34 @@ static void populate_value(struct ref_array_item *ref)
continue; continue;
} else if (match_atom_name(name, "align", &valp)) { } else if (match_atom_name(name, "align", &valp)) {
struct align *align = &v->u.align; struct align *align = &v->u.align;
struct strbuf **s, **to_free; struct string_list params = STRING_LIST_INIT_DUP;
int i;
int width = -1; int width = -1;
if (!valp) if (!valp)
die(_("expected format: %%(align:<width>,<position>)")); die(_("expected format: %%(align:<width>,<position>)"));
/*
* TODO: Implement a function similar to strbuf_split_str()
* which would omit the separator from the end of each value.
*/
s = to_free = strbuf_split_str(valp, ',', 0);
align->position = ALIGN_LEFT; align->position = ALIGN_LEFT;
while (*s) { string_list_split(&params, valp, ',', -1);
/* Strip trailing comma */ for (i = 0; i < params.nr; i++) {
if (s[1]) const char *s = params.items[i].string;
strbuf_setlen(s[0], s[0]->len - 1); if (!strtoul_ui(s, 10, (unsigned int *)&width))
if (!strtoul_ui(s[0]->buf, 10, (unsigned int *)&width))
; ;
else if (!strcmp(s[0]->buf, "left")) else if (!strcmp(s, "left"))
align->position = ALIGN_LEFT; align->position = ALIGN_LEFT;
else if (!strcmp(s[0]->buf, "right")) else if (!strcmp(s, "right"))
align->position = ALIGN_RIGHT; align->position = ALIGN_RIGHT;
else if (!strcmp(s[0]->buf, "middle")) else if (!strcmp(s, "middle"))
align->position = ALIGN_MIDDLE; align->position = ALIGN_MIDDLE;
else else
die(_("improper format entered align:%s"), s[0]->buf); die(_("improper format entered align:%s"), s);
s++;
} }
if (width < 0) if (width < 0)
die(_("positive width expected with the %%(align) atom")); die(_("positive width expected with the %%(align) atom"));
align->width = width; align->width = width;
strbuf_list_free(to_free); string_list_clear(&params, 0);
v->handler = align_atom_handler; v->handler = align_atom_handler;
continue; continue;
} else if (!strcmp(name, "end")) { } else if (!strcmp(name, "end")) {