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 v4 07/12] ref-filter: introduce parse_align_position()
Date: Sun, 31 Jan 2016 23:12:51 +0530 [thread overview]
Message-ID: <1454262176-6594-8-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1454262176-6594-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 7adff67..e6b6b55 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(_("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 struct {
const char *name;
cmp_type cmp_type;
@@ -910,14 +921,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.0
next prev parent reply other threads:[~2016-01-31 17:43 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-31 17:42 [PATCH v4 00/12] ref-filter: use parsing functions Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 01/12] strbuf: introduce strbuf_split_str_omit_term() Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 02/12] ref-filter: use strbuf_split_str_omit_term() Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 03/12] ref-filter: bump 'used_atom' and related code to the top Karthik Nayak
2016-02-01 22:22 ` Junio C Hamano
2016-02-02 18:50 ` Karthik Nayak
2016-02-02 18:56 ` Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 04/12] ref-filter: introduce struct used_atom Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 05/12] ref-filter: introduce parsing functions for each valid atom Karthik Nayak
2016-02-03 22:19 ` Eric Sunshine
2016-02-04 1:17 ` Junio C Hamano
2016-02-06 14:36 ` Karthik Nayak
2016-02-07 7:03 ` Eric Sunshine
2016-02-07 9:03 ` Karthik Nayak
2016-02-06 15:15 ` Karthik Nayak
2016-02-07 6:33 ` Eric Sunshine
2016-02-07 9:01 ` Karthik Nayak
2016-02-07 9:12 ` Eric Sunshine
2016-02-07 13:47 ` Andreas Schwab
2016-02-09 17:00 ` Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 06/12] ref-filter: introduce color_atom_parser() Karthik Nayak
2016-02-04 22:25 ` Eric Sunshine
2016-02-06 15:20 ` Karthik Nayak
2016-02-06 15:51 ` Christian Couder
2016-02-07 7:53 ` Eric Sunshine
2016-02-07 7:43 ` Eric Sunshine
2016-02-07 9:04 ` Karthik Nayak
2016-01-31 17:42 ` Karthik Nayak [this message]
2016-01-31 17:42 ` [PATCH v4 08/12] ref-filter: introduce align_atom_parser() Karthik Nayak
2016-02-04 23:48 ` Eric Sunshine
2016-02-06 15:26 ` Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 09/12] ref-filter: align: introduce long-form syntax Karthik Nayak
2016-02-05 0:00 ` Eric Sunshine
2016-02-06 18:37 ` Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 11/12] ref-filter: introduce contents_atom_parser() Karthik Nayak
2016-02-05 0:22 ` Eric Sunshine
2016-02-07 4:58 ` Karthik Nayak
2016-01-31 17:42 ` [PATCH v4 12/12] ref-filter: introduce objectname_atom_parser() Karthik Nayak
2016-02-01 22:25 ` [PATCH v4 00/12] ref-filter: use parsing functions Junio C Hamano
2016-02-02 0:37 ` Eric Sunshine
2016-02-02 4:35 ` Karthik Nayak
2016-02-05 0:34 ` Eric Sunshine
[not found] ` <1454262176-6594-11-git-send-email-Karthik.188@gmail.com>
2016-02-02 0:59 ` [PATCH v4 10/12] ref-filter: introduce remote_ref_atom_parser() Eric Sunshine
2016-02-02 2:59 ` Karthik Nayak
2016-02-05 0:05 ` Eric Sunshine
2016-02-06 18:44 ` 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=1454262176-6594-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).