summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-02-17 23:36:09 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 14:06:45 -0800
commit132676478c808b5468cc47daccf5324055a81229 (patch)
tree71086982281af0ca3c2f3014bdd9edc1ddc1eacf
parenttag: do not show ambiguous tag names as "tags/foo" (diff)
downloadtgif-132676478c808b5468cc47daccf5324055a81229.tar.xz
ref-filter: use string_list_split over strbuf_split
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>
-rw-r--r--ref-filter.c29
1 files changed, 11 insertions, 18 deletions
diff --git a/ref-filter.c b/ref-filter.c
index f097176ed9..19367ce705 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -886,41 +886,34 @@ static void populate_value(struct ref_array_item *ref)
continue;
} else if (match_atom_name(name, "align", &valp)) {
struct align *align = &v->u.align;
- struct strbuf **s, **to_free;
+ struct string_list params = STRING_LIST_INIT_DUP;
+ int i;
int width = -1;
if (!valp)
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;
- while (*s) {
- /* Strip trailing comma */
- if (s[1])
- strbuf_setlen(s[0], s[0]->len - 1);
- if (!strtoul_ui(s[0]->buf, 10, (unsigned int *)&width))
+ string_list_split(&params, valp, ',', -1);
+ for (i = 0; i < params.nr; i++) {
+ const char *s = params.items[i].string;
+ if (!strtoul_ui(s, 10, (unsigned int *)&width))
;
- else if (!strcmp(s[0]->buf, "left"))
+ else if (!strcmp(s, "left"))
align->position = ALIGN_LEFT;
- else if (!strcmp(s[0]->buf, "right"))
+ else if (!strcmp(s, "right"))
align->position = ALIGN_RIGHT;
- else if (!strcmp(s[0]->buf, "middle"))
+ else if (!strcmp(s, "middle"))
align->position = ALIGN_MIDDLE;
else
- die(_("improper format entered align:%s"), s[0]->buf);
- s++;
+ die(_("improper format entered align:%s"), s);
}
if (width < 0)
die(_("positive width expected with the %%(align) atom"));
align->width = width;
- strbuf_list_free(to_free);
+ string_list_clear(&params, 0);
v->handler = align_atom_handler;
continue;
} else if (!strcmp(name, "end")) {