git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 02/12] ref-filter: use strbuf_split_str_omit_term()
Date: Sun, 31 Jan 2016 23:12:46 +0530	[thread overview]
Message-ID: <1454262176-6594-3-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1454262176-6594-1-git-send-email-Karthik.188@gmail.com>

Use the newly introduced strbuf_split_str_omit_term() rather than
using strbuf_split_str() and manually removing the ',' terminator.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
 ref-filter.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index f097176..38f38d4 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -892,18 +892,11 @@ static void populate_value(struct ref_array_item *ref)
 			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);
+			s = to_free = strbuf_split_str_omit_term(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))
 					;
 				else if (!strcmp(s[0]->buf, "left"))
-- 
2.7.0

  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 ` Karthik Nayak [this message]
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 ` [PATCH v4 07/12] ref-filter: introduce parse_align_position() Karthik Nayak
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-3-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).