diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2016-02-17 18:06:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 22:06:45 (GMT) |
| commit | 25a8d79e00f7434676237dc11e8b661c41834650 (patch) | |
| tree | 4ce7fb2e0e0814f5fc3c1f7dcb7be85d1536e614 /ref-filter.c | |
| parent | fd935cc7e8e2fdf7ad837dc74509c75877a489ba (diff) | |
| download | git-25a8d79e00f7434676237dc11e8b661c41834650.zip git-25a8d79e00f7434676237dc11e8b661c41834650.tar.gz git-25a8d79e00f7434676237dc11e8b661c41834650.tar.bz2 | |
ref-filter: introduce parse_align_position()
Extract parse_align_position() from populate_value(), which, given a
string, would give us the alignment position. This is a preparatory
patch as to introduce prefixes for the %(align) atom and avoid
redundancy in the code.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
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>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/ref-filter.c b/ref-filter.c index c90d2f4..e8b076d 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -44,6 +44,17 @@ static void color_atom_parser(struct used_atom *atom, const char *color_value) die(_("unrecognized color: %%(color:%s)"), color_value); } +static align_type parse_align_position(const char *s) +{ + if (!strcmp(s, "right")) + return ALIGN_RIGHT; + else if (!strcmp(s, "middle")) + return ALIGN_MIDDLE; + else if (!strcmp(s, "left")) + return ALIGN_LEFT; + return -1; +} + static struct { const char *name; cmp_type cmp_type; @@ -912,14 +923,12 @@ static void populate_value(struct ref_array_item *ref) string_list_split(¶ms, valp, ',', -1); for (i = 0; i < params.nr; i++) { const char *s = params.items[i].string; + int position; + if (!strtoul_ui(s, 10, (unsigned int *)&width)) ; - else if (!strcmp(s, "left")) - align->position = ALIGN_LEFT; - else if (!strcmp(s, "right")) - align->position = ALIGN_RIGHT; - else if (!strcmp(s, "middle")) - align->position = ALIGN_MIDDLE; + else if ((position = parse_align_position(s)) >= 0) + align->position = position; else die(_("improper format entered align:%s"), s); } |