undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strbuf: allow strbuf_split to work on non-strbufs

Browse Source 
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>
This commit is contained in:
Jeff King 2011-06-09 11:54:58 -04:00 committed by Junio C Hamano
parent c5d6350bdc
commit 2f1d9e2b93
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
strbuf.c
View File

@ -101,19 +101,19 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0'; 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; int alloc = 2, pos = 0;
char *n, *p; const char *n, *p;
struct strbuf **ret; struct strbuf **ret;
struct strbuf *t; struct strbuf *t;
ret = xcalloc(alloc, sizeof(struct strbuf *)); ret = xcalloc(alloc, sizeof(struct strbuf *));
p = n = sb->buf; p = n = str;
while (n < sb->buf + sb->len) { while (n < str + slen) {
int len; int len;
if (max <= 0 || pos + 1 < max) if (max <= 0 || pos + 1 < max)
n = memchr(n, delim, sb->len - (n - sb->buf)); n = memchr(n, delim, slen - (n - str));
else else
n = NULL; n = NULL;
if (pos + 1 >= alloc) { 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); ret = xrealloc(ret, sizeof(struct strbuf *) * alloc);
} }
if (!n) if (!n)
n = sb->buf + sb->len - 1; n = str + slen - 1;
len = n - p + 1; len = n - p + 1;
t = xmalloc(sizeof(struct strbuf)); t = xmalloc(sizeof(struct strbuf));
strbuf_init(t, len); strbuf_init(t, len);

12
strbuf.h
View File

@ -47,8 +47,18 @@ extern void strbuf_rtrim(struct strbuf *);
extern void strbuf_ltrim(struct strbuf *); extern void strbuf_ltrim(struct strbuf *);
extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);
extern struct strbuf **strbuf_split_max(const struct strbuf *, extern struct strbuf **strbuf_split_buf(const char *, size_t,
int delim, int max); int delim, int max);
static inline struct strbuf **strbuf_split_str(const char *str,
int delim, int max)
{
return strbuf_split_buf(str, strlen(str), delim, max);
}
static inline struct strbuf **strbuf_split_max(const struct strbuf *sb,
int delim, int max)
{
return strbuf_split_buf(sb->buf, sb->len, delim, max);
}
static inline struct strbuf **strbuf_split(const struct strbuf *sb, int delim) static inline struct strbuf **strbuf_split(const struct strbuf *sb, int delim)
{ {
return strbuf_split_max(sb, delim, 0); return strbuf_split_max(sb, delim, 0);