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

ref-filter: introduce parse_align_position()

Browse Source 
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>
This commit is contained in:
Karthik Nayak 2016-02-17 23:36:14 +05:30 committed by Junio C Hamano
parent fd935cc7e8
commit 25a8d79e00
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ref-filter.c
View File

@ -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(&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);
}