summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2012-11-04 07:46:51 +0100
committerLibravatar Jeff King <peff@peff.net>2012-11-04 06:46:55 -0500
commitb8c2c1fa35f240ea8eee719c0f5a657285864573 (patch)
treebdc22ab0485418b9ef905a580ef2543e92081d6d
parentMerge branch 'rs/branch-del-symref' (diff)
downloadtgif-b8c2c1fa35f240ea8eee719c0f5a657285864573.tar.xz
strbuf_split_buf(): use ALLOC_GROW()
Use ALLOC_GROW() rather than inline code to manage memory in strbuf_split_buf(). Rename "pos" to "nr" because it better describes the use of the variable and it better conforms to the "ALLOC_GROW" idiom. Also, instead of adding a sentinal NULL value after each entry is added to the list, only add it once after all of the entries have been added. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net>
-rw-r--r--strbuf.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/strbuf.c b/strbuf.c
index 4b9e30cadc..5256c2a086 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -108,33 +108,30 @@ void strbuf_ltrim(struct strbuf *sb)
struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int max)
{
- int alloc = 2, pos = 0;
+ struct strbuf **ret = NULL;
+ size_t nr = 0, alloc = 0;
const char *n, *p;
- struct strbuf **ret;
struct strbuf *t;
- ret = xcalloc(alloc, sizeof(struct strbuf *));
p = n = str;
while (n < str + slen) {
int len;
- if (max <= 0 || pos + 1 < max)
+ if (max <= 0 || nr + 1 < max)
n = memchr(n, delim, slen - (n - str));
else
n = NULL;
- if (pos + 1 >= alloc) {
- alloc = alloc * 2;
- ret = xrealloc(ret, sizeof(struct strbuf *) * alloc);
- }
if (!n)
n = str + slen - 1;
len = n - p + 1;
t = xmalloc(sizeof(struct strbuf));
strbuf_init(t, len);
strbuf_add(t, p, len);
- ret[pos] = t;
- ret[++pos] = NULL;
+ ALLOC_GROW(ret, nr + 2, alloc);
+ ret[nr++] = t;
p = ++n;
}
+ ALLOC_GROW(ret, nr + 1, alloc); /* In case string was empty */
+ ret[nr] = NULL;
return ret;
}