Skip to content

Commit

Permalink
ref-filter: introduce parse_align_position()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karthik Nayak authored and Junio C Hamano committed Feb 17, 2016
1 parent fd935cc commit 25a8d79
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions ref-filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -912,14 +923,12 @@ static void populate_value(struct ref_array_item *ref)
string_list_split(&params, 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);
}
Expand Down

0 comments on commit 25a8d79

Please sign in to comment.