Introduce color_atom_parser() which will parse a "color" atom and
store its color in the "used_atom" structure for further usage in
populate_value().
Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com>
Helped-by: Eric Sunshine <sunsh...@sunshineco.com>
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
ref-filter.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index b54c872..9708d67 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -29,6 +29,9 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
static struct used_atom {
const char *name;
cmp_type type;
+ union {
+ char *color;
+ } u;
} *used_atom;
static int used_atom_cnt, need_tagged, need_symref;
static int need_color_reset_at_eol;
@@ -53,6 +56,18 @@ static int match_atom_name(const char *name, const char
*atom_name, const char *
return 1;
}
+static void color_atom_parser(struct used_atom *atom)
+{
+ if (!match_atom_name(atom->name, "color", (const char
**)&atom->u.color))
+ die("BUG: parsing non-'color'");
+ if (!atom->u.color)
+ die(_("expected format: %%(color:<color>)"));
+ /* atom->u.color points to part of atom->name */
+ atom->u.color = xstrdup(atom->u.color);
+ if (color_parse(atom->u.color, atom->u.color) < 0)
+ die(_("invalid color value: %s"), atom->u.color);
+}
+
static struct {
const char *name;
cmp_type cmp_type;
@@ -90,7 +105,7 @@ static struct {
{ "symref" },
{ "flag" },
{ "HEAD" },
- { "color" },
+ { "color", FIELD_STR, color_atom_parser },
{ "align" },
{ "end" },
};
@@ -175,6 +190,7 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
REALLOC_ARRAY(used_atom, used_atom_cnt);
used_atom[at].name = xmemdupz(atom, ep - atom);
used_atom[at].type = valid_atom[i].cmp_type;
+ memset(&used_atom[at].u, 0, sizeof(used_atom[at].u));
if (valid_atom[i].parser)
valid_atom[i].parser(&used_atom[at]);
if (*atom == '*')
@@ -794,6 +810,7 @@ static void populate_value(struct ref_array_item *ref)
/* Fill in specials first */
for (i = 0; i < used_atom_cnt; i++) {
+ struct used_atom *atom = &used_atom[i];
const char *name = used_atom[i].name;
struct atom_value *v = &ref->value[i];
int deref = 0;
@@ -834,14 +851,8 @@ static void populate_value(struct ref_array_item *ref)
refname = branch_get_push(branch, NULL);
if (!refname)
continue;
- } else if (match_atom_name(name, "color", &valp)) {
- char color[COLOR_MAXLEN] = "";
-
- if (!valp)
- die(_("expected format: %%(color:<color>)"));
- if (color_parse(valp, color) < 0)
- die(_("unable to parse format"));
- v->s = xstrdup(color);
+ } else if (starts_with(name, "color:")) {
+ v->s = atom->u.color;
continue;
} else if (!strcmp(name, "flag")) {
char buf[256], *cp = buf;
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
