From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sunshine@sunshineco.com,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v5 07/12] ref-filter: introduce parse_align_position()
Date: Wed, 17 Feb 2016 00:30:10 +0530 [thread overview]
Message-ID: <1455649215-23260-8-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1455649215-23260-1-git-send-email-Karthik.188@gmail.com>
>From populate_value() extract 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 <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
ref-filter.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index f401da6..a08ea83 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;
@@ -911,14 +922,12 @@ static void populate_value(struct ref_array_item *ref)
align->position = ALIGN_LEFT;
while (*s) {
+ int position;
+
if (!strtoul_ui(s[0]->buf, 10, (unsigned int *)&width))
;
- else if (!strcmp(s[0]->buf, "left"))
- align->position = ALIGN_LEFT;
- else if (!strcmp(s[0]->buf, "right"))
- align->position = ALIGN_RIGHT;
- else if (!strcmp(s[0]->buf, "middle"))
- align->position = ALIGN_MIDDLE;
+ else if ((position = parse_align_position(s[0]->buf)) >= 0)
+ align->position = position;
else
die(_("improper format entered align:%s"), s[0]->buf);
s++;
--
2.7.1
next prev parent reply other threads:[~2016-02-16 19:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 19:00 [PATCH v5 00/12] ref-filter: use parsing functions Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 01/12] strbuf: introduce strbuf_split_str_omit_term() Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 02/12] ref-filter: use strbuf_split_str_omit_term() Karthik Nayak
2016-02-16 19:22 ` Jeff King
2016-02-16 19:23 ` Jeff King
2016-02-16 20:12 ` Eric Sunshine
2016-02-16 20:49 ` Jeff King
2016-02-16 21:09 ` Eric Sunshine
2016-02-16 22:34 ` Jeff King
2016-02-16 22:49 ` Eric Sunshine
2016-02-16 23:18 ` Jeff King
2016-02-17 0:12 ` Junio C Hamano
2016-02-17 0:22 ` Jeff King
2016-02-17 0:28 ` Junio C Hamano
2016-02-17 0:32 ` Jeff King
2016-02-17 17:50 ` Junio C Hamano
2016-02-17 17:04 ` Karthik Nayak
2016-02-17 17:39 ` Eric Sunshine
2016-02-17 18:07 ` Karthik Nayak
2016-02-17 18:17 ` Eric Sunshine
2016-02-17 18:21 ` Karthik Nayak
2016-02-17 16:58 ` Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 03/12] ref-filter: bump 'used_atom' and related code to the top Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 04/12] ref-filter: introduce struct used_atom Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 05/12] ref-filter: introduce parsing functions for each valid atom Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 06/12] ref-filter: introduce color_atom_parser() Karthik Nayak
2016-02-16 19:00 ` Karthik Nayak [this message]
2016-02-16 19:00 ` [PATCH v5 08/12] ref-filter: introduce align_atom_parser() Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 09/12] ref-filter: align: introduce long-form syntax Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 10/12] ref-filter: introduce remote_ref_atom_parser() Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 11/12] ref-filter: introduce contents_atom_parser() Karthik Nayak
2016-02-16 19:00 ` [PATCH v5 12/12] ref-filter: introduce objectname_atom_parser() Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455649215-23260-8-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).