Re: [PATCH v2 07/11] ref-filter: introduce align_atom_parser()
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Dec 18, 2015, 05:50 UTC
- Message-ID
- <CAPig+cTvKL9C0M3NKF395dq6yCP94AL+iDe0EGRaK9xYDZ0YuQ@mail.gmail.com>
- In-Reply-To
- <1450279802-29414-8-git-send-email-Karthik.188@gmail.com>
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak <karthik.188@gmail.com> wrote:
Show 21 quoted lines
> Introduce align_atom_parser() which will parse an "align" atom and
> store the required alignment position and width in the "use_atom"
> structure for further usage in 'populate_value()'.
>
> Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
> ---
> diff --git a/ref-filter.c b/ref-filter.c
> @@ -63,6 +69,49 @@ static void color_atom_parser(struct used_atom *atom)
> +static void align_atom_parser(struct used_atom *atom)
> +{
> + [...]
> + match_atom_name(atom->str, "align", &buf);
> + if (!buf)
> + die(_("expected format: %%(align:<width>,<position>)"));
> + [...]
> +}
> @@ -880,35 +924,7 @@ static void populate_value(struct ref_array_item *ref)
> v->s = " ";
> continue;
> } else if (match_atom_name(name, "align", &valp)) {Hmm, align_atom_parser() has already been called before we get here, right? And it has already invoked match_atom_name() and died if the argument to "align:" was missing, correct? If so, then this invocation of match_atom_name() in populate_value() is unnecessary and should be replaced with a simpler starts_with("align:").
Plus, 'valp' is not used, aside from this unnecessary match_atom_name(), thus it can be removed as well.
Show 35 quoted lines
> - struct align *align = &v->u.align;
> - struct strbuf **s, **to_free;
> - int width = -1;
> -
> - if (!valp)
> - die(_("expected format: %%(align:<width>,<position>)"));
> -
> - s = to_free = strbuf_split_str_omit_term(valp, ',', 0);
> -
> - align->position = ALIGN_LEFT;
> -
> - while (*s) {
> - 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
> - die(_("improper format entered align:%s"), s[0]->buf);
> - s++;
> - }
> -
> - if (width < 0)
> - die(_("positive width expected with the %%(align) atom"));
> - align->width = width;
> - strbuf_list_free(to_free);
> + v->u.align = atom->u.align;
> v->handler = align_atom_handler;
> continue;
> } else if (!strcmp(name, "end")) {
> --
> 2.6.4