[PATCH 01/10] strbuf_split: add a max parameter
- From
Jeff King <peff@peff.net>
- Date
- Jun 9, 2011, 15:51 UTC
- Message-ID
- <20110609155121.GA25507@sigill.intra.peff.net>
- In-Reply-To
- <20110609155001.GA14969@sigill.intra.peff.net>
Sometimes when splitting, you only want a limited number of fields, and for the final field to contain "everything else", even if it includes the delimiter.
This patch introduces strbuf_split_max, which provides a "max number of fields" parameter; it behaves similarly to perl's "split" with a 3rd field.
The existing 2-argument form of strbuf_split is retained for compatibility and ease-of-use.
Signed-off-by: Jeff King <peff@peff.net> --- I am tempted to just call this new one strbuf_split and update all callers. There aren't that many.
strbuf.c | 7 +++++-- strbuf.h | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/strbuf.c b/strbuf.c index 09c43ae..64f6c1e 100644 --- a/strbuf.c +++ b/strbuf.c @@ -103,7 +103,7 @@ void strbuf_ltrim(struct strbuf *sb) sb->buf[sb->len] = '\0'; } -struct strbuf **strbuf_split(const struct strbuf *sb, int delim) +struct strbuf **strbuf_split_max(const struct strbuf *sb, int delim, int max) { int alloc = 2, pos = 0; char *n, *p; @@ -114,7 +114,10 @@ struct strbuf **strbuf_split(const struct strbuf *sb, int delim) p = n = sb->buf; while (n < sb->buf + sb->len) { int len; - n = memchr(n, delim, sb->len - (n - sb->buf)); + if (max <= 0 || pos + 1 < max) + n = memchr(n, delim, sb->len - (n - sb->buf)); + else + n = NULL; if (pos + 1 >= alloc) { alloc = alloc * 2; ret = xrealloc(ret, sizeof(struct strbuf *) * alloc); diff --git a/strbuf.h b/strbuf.h index 9e6d9fa..4cf1dcd 100644 --- a/strbuf.h +++ b/strbuf.h @@ -44,7 +44,12 @@ extern void strbuf_rtrim(struct strbuf *); extern void strbuf_ltrim(struct strbuf *); extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); -extern struct strbuf **strbuf_split(const struct strbuf *, int delim); +extern struct strbuf **strbuf_split_max(const struct strbuf *, + int delim, int max); +static inline struct strbuf **strbuf_split(const struct strbuf *sb, int delim) +{ + return strbuf_split_max(sb, delim, 0); +} extern void strbuf_list_free(struct strbuf **); /*----- add data in your buffer -----*/
-- 1.7.6.rc1.36.g91167