>From align_atom_parser() form parse_align_position() 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 <[email protected]>
Signed-off-by: Karthik Nayak <[email protected]>
---
 ref-filter.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index fa081a8..ccad4c3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -74,6 +74,17 @@ static void color_atom_parser(struct used_atom *atom)
                die(_("invalid color value: %s"), atom->u.color);
 }
 
+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 void align_atom_parser(struct used_atom *atom)
 {
        struct align *align = &atom->u.align;
@@ -90,16 +101,13 @@ static void align_atom_parser(struct used_atom *atom)
        align->position = ALIGN_LEFT;
 
        while (*s) {
+               int position;
                buf = s[0]->buf;
 
                if (!strtoul_ui(buf, 10, (unsigned int *)&width))
                        ;
-               else if (!strcmp(buf, "left"))
-                       align->position = ALIGN_LEFT;
-               else if (!strcmp(buf, "right"))
-                       align->position = ALIGN_RIGHT;
-               else if (!strcmp(buf, "middle"))
-                       align->position = ALIGN_MIDDLE;
+               else if ((position = parse_align_position(buf)) >= 0)
+                       align->position = position;
                else
                        die(_("unrecognized %%(align) argument: %s"), buf);
                s++;
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to