git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
	Josh Triplett <josh@joshtriplett.org>,
	Thomas Rast <tr@thomasrast.ch>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v3 12/17] strbuf: add strbuf_replace()
Date: Sun, 26 Jan 2014 18:00:05 +0100	[thread overview]
Message-ID: <20140126170011.24291.50133.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140126165018.24291.47716.chriscool@tuxfamily.org>

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 strbuf.c | 7 +++++++
 strbuf.h | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/strbuf.c b/strbuf.c
index 2124bb8..e45e513 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -197,6 +197,13 @@ void strbuf_splice(struct strbuf *sb, size_t pos, size_t len,
 	strbuf_setlen(sb, sb->len + dlen - len);
 }
 
+void strbuf_replace(struct strbuf *sb, const char *a, const char *b)
+{
+	char *ptr = strstr(sb->buf, a);
+	if (ptr)
+		strbuf_splice(sb, ptr - sb->buf, strlen(a), b, strlen(b));
+}
+
 void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len)
 {
 	strbuf_splice(sb, pos, 0, data, len);
diff --git a/strbuf.h b/strbuf.h
index 02bff3a..38faf70 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -111,6 +111,9 @@ extern void strbuf_remove(struct strbuf *, size_t pos, size_t len);
 extern void strbuf_splice(struct strbuf *, size_t pos, size_t len,
                           const void *, size_t);
 
+/* first occurence of a replaced with b */
+extern void strbuf_replace(struct strbuf *, const char *a, const char *b);
+
 extern void strbuf_add_commented_lines(struct strbuf *out, const char *buf, size_t size);
 
 extern void strbuf_add(struct strbuf *, const void *, size_t);
-- 
1.8.5.2.201.gacc5987

  parent reply	other threads:[~2014-01-26 17:24 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-26 16:59 [PATCH v3 00/17] Add interpret-trailers builtin Christian Couder
2014-01-26 16:59 ` [PATCH v3 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-26 16:59 ` [PATCH v3 02/17] trailer: process trailers from file and arguments Christian Couder
2014-01-26 16:59 ` [PATCH v3 03/17] trailer: read and process config information Christian Couder
2014-01-26 16:59 ` [PATCH v3 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-26 16:59 ` [PATCH v3 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-26 16:59 ` [PATCH v3 06/17] trailer: parse trailers from input file Christian Couder
2014-01-26 17:00 ` [PATCH v3 07/17] trailer: put all the processing together and print Christian Couder
2014-01-26 17:00 ` [PATCH v3 08/17] trailer: add interpret-trailers command Christian Couder
2014-01-26 17:00 ` [PATCH v3 09/17] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-26 17:00 ` [PATCH v3 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-01-26 17:00 ` [PATCH v3 11/17] trailer: add new_trailer_item() function Christian Couder
2014-01-26 17:00 ` Christian Couder [this message]
2014-01-26 17:00 ` [PATCH v3 13/17] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-26 17:00 ` [PATCH v3 14/17] trailer: add tests for trailer command Christian Couder
2014-01-26 17:00 ` [PATCH v3 15/17] trailer: set author and committer env variables Christian Couder
2014-01-26 17:00 ` [PATCH v3 16/17] trailer: add tests for commands using " Christian Couder
2014-01-26 17:00 ` [PATCH v3 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-01-27  0:52   ` Eric Sunshine
2014-01-27 20:33     ` Christian Couder
2014-01-27 21:20       ` Junio C Hamano
2014-01-29 20:01         ` Christian Couder
2014-01-29 20:30           ` Junio C Hamano
2014-02-02 11:22       ` Eric Sunshine
2014-01-27 21:05 ` [PATCH v3 00/17] Add interpret-trailers builtin Junio C Hamano
2014-01-29 19:27   ` Christian Couder

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=20140126170011.24291.50133.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=dan.carpenter@oracle.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=greg@kroah.com \
    --cc=johan@herland.net \
    --cc=josh@joshtriplett.org \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    --cc=tr@thomasrast.ch \
    /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).