git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 01/11] ref-filter: use string_list_split over strbuf_split

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Feb 17, 2016, 22:11 UTC
Message-ID
<CAPig+cRTtXPjvCL3a-2Y+sKBPY1fKNO39VYnzFQ7Ed3dJn+w8w@mail.gmail.com>
In-Reply-To
<1455732379-22479-2-git-send-email-Karthik.188@gmail.com>
On Wed, Feb 17, 2016 at 1:06 PM, Karthik Nayak <karthik.188@gmail.com> wrote:
Show 7 quoted lines
> From: Jeff King <peff@peff.net>
>
> We don't do any post-processing on the resulting strbufs, so it is
> simpler to just use string_list_split, which takes care of removing
> the delimiter for us.
>
> Written-by: Jeff King <peff@peff.net>
Perhaps Peff can give his sign-off...
Show 64 quoted lines
> Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
> ---
>  ref-filter.c | 29 +++++++++++------------------
>  1 file changed, 11 insertions(+), 18 deletions(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index f097176..19367ce 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -886,41 +886,34 @@ static void populate_value(struct ref_array_item *ref)
>                         continue;
>                 } else if (match_atom_name(name, "align", &valp)) {
>                         struct align *align = &v->u.align;
> -                       struct strbuf **s, **to_free;
> +                       struct string_list params = STRING_LIST_INIT_DUP;
> +                       int i;
>                         int width = -1;
>
>                         if (!valp)
>                                 die(_("expected format: %%(align:<width>,<position>)"));
>
> -                       /*
> -                        * TODO: Implement a function similar to strbuf_split_str()
> -                        * which would omit the separator from the end of each value.
> -                        */
> -                       s = to_free = strbuf_split_str(valp, ',', 0);
> -
>                         align->position = ALIGN_LEFT;
>
> -                       while (*s) {
> -                               /*  Strip trailing comma */
> -                               if (s[1])
> -                                       strbuf_setlen(s[0], s[0]->len - 1);
> -                               if (!strtoul_ui(s[0]->buf, 10, (unsigned int *)&width))
> +                       string_list_split(&params, valp, ',', -1);
> +                       for (i = 0; i < params.nr; i++) {
> +                               const char *s = params.items[i].string;
> +                               if (!strtoul_ui(s, 10, (unsigned int *)&width))
>                                         ;
> -                               else if (!strcmp(s[0]->buf, "left"))
> +                               else if (!strcmp(s, "left"))
>                                         align->position = ALIGN_LEFT;
> -                               else if (!strcmp(s[0]->buf, "right"))
> +                               else if (!strcmp(s, "right"))
>                                         align->position = ALIGN_RIGHT;
> -                               else if (!strcmp(s[0]->buf, "middle"))
> +                               else if (!strcmp(s, "middle"))
>                                         align->position = ALIGN_MIDDLE;
>                                 else
> -                                       die(_("improper format entered align:%s"), s[0]->buf);
> -                               s++;
> +                                       die(_("improper format entered align:%s"), s);
>                         }
>
>                         if (width < 0)
>                                 die(_("positive width expected with the %%(align) atom"));
>                         align->width = width;
> -                       strbuf_list_free(to_free);
> +                       string_list_clear(&params, 0);
>                         v->handler = align_atom_handler;
>                         continue;
>                 } else if (!strcmp(name, "end")) {
> --
> 2.7.1
Previous: Karthik NayakNext: Jeff King
Message 3 of 18 in “ref-filter: use parsing functions”
  1. 00/11 ref-filter: use parsing functionsKarthik Nayak, Feb 17, 2016
  2. 01/11 ref-filter: use string_list_split over strbuf_splitKarthik Nayak, Feb 17, 2016
  3. Eric SunshineFeb 17, 2016
  4. Jeff KingFeb 17, 2016
  5. Junio C HamanoFeb 17, 2016
  6. Eric SunshineFeb 17, 2016
  7. Jeff KingFeb 17, 2016
  8. Karthik NayakFeb 18, 2016
  9. 02/11 ref-filter: bump 'used_atom' and related code to the topKarthik Nayak, Feb 17, 2016
  10. 03/11 ref-filter: introduce struct used_atomKarthik Nayak, Feb 17, 2016
  11. 04/11 ref-filter: introduce parsing functions for each valid atomKarthik Nayak, Feb 17, 2016
  12. 05/11 ref-filter: introduce color_atom_parser()Karthik Nayak, Feb 17, 2016
  13. 06/11 ref-filter: introduce parse_align_position()Karthik Nayak, Feb 17, 2016
  14. 07/11 ref-filter: introduce align_atom_parser()Karthik Nayak, Feb 17, 2016
  15. 08/11 ref-filter: align: introduce long-form syntaxKarthik Nayak, Feb 17, 2016
  16. 09/11 ref-filter: introduce remote_ref_atom_parser()Karthik Nayak, Feb 17, 2016
  17. 10/11 ref-filter: introduce contents_atom_parser()Karthik Nayak, Feb 17, 2016
  18. 11/11 ref-filter: introduce objectname_atom_parser()Karthik Nayak, Feb 17, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.