summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-09 15:54:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-22 18:24:51 (GMT)
commit2f1d9e2b93e1b7fbfcfa59331db89dd6c76a3505 (patch)
treee94c085b9536fa2d196c546482b9c80dfee6fb0b /strbuf.c
parentc5d6350bdc8d0d8bd4bd1aa0273313e71cd548f6 (diff)
downloadgit-2f1d9e2b93e1b7fbfcfa59331db89dd6c76a3505.zip
git-2f1d9e2b93e1b7fbfcfa59331db89dd6c76a3505.tar.gz
git-2f1d9e2b93e1b7fbfcfa59331db89dd6c76a3505.tar.bz2
strbuf: allow strbuf_split to work on non-strbufs
The strbuf_split function takes a strbuf as input, and outputs a list of strbufs. However, there is no reason that the input has to be a strbuf, and not an arbitrary buffer. This patch adds strbuf_split_buf for a length-delimited buffer, and strbuf_split_str for NUL-terminated strings. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/strbuf.c b/strbuf.c
index 74f661e..a71de9c 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -101,19 +101,19 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}
-struct strbuf **strbuf_split_max(const struct strbuf *sb, int delim, int max)
+struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int max)
{
int alloc = 2, pos = 0;
- char *n, *p;
+ const char *n, *p;
struct strbuf **ret;
struct strbuf *t;
ret = xcalloc(alloc, sizeof(struct strbuf *));
- p = n = sb->buf;
- while (n < sb->buf + sb->len) {
+ p = n = str;
+ while (n < str + slen) {
int len;
if (max <= 0 || pos + 1 < max)
- n = memchr(n, delim, sb->len - (n - sb->buf));
+ n = memchr(n, delim, slen - (n - str));
else
n = NULL;
if (pos + 1 >= alloc) {
@@ -121,7 +121,7 @@ struct strbuf **strbuf_split_max(const struct strbuf *sb, int delim, int max)
ret = xrealloc(ret, sizeof(struct strbuf *) * alloc);
}
if (!n)
- n = sb->buf + sb->len - 1;
+ n = str + slen - 1;
len = n - p + 1;
t = xmalloc(sizeof(struct strbuf));
strbuf_init(t, len);