aboutsummaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2012-11-04 07:46:53 +0100
committerJeff King <peff@peff.net>2012-11-04 06:46:55 -0500
commit17b73dc699c46d7af5d29d2f3813e7addafdce0d (patch)
tree297e4fe1f7353c63d0db07bae5f192db77b244a8 /strbuf.c
parent1173bb331103b7e6d9e95549c7b7be12546d0697 (diff)
downloadgit-17b73dc699c46d7af5d29d2f3813e7addafdce0d.tar.gz
git-17b73dc699c46d7af5d29d2f3813e7addafdce0d.tar.xz
strbuf_split*(): rename "delim" parameter to "terminator"
The word "delimiter" suggests that the argument separates the substrings, whereas in fact (1) the delimiter characters are included in the output, and (2) if the input string ends with the delimiter, then the output does not include a final empty string. So rename the "delim" arguments of the strbuf_split() family of functions to "terminator", which is more suggestive of how it is used. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/strbuf.c b/strbuf.c
index c7cd529b3..05d0693eb 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -106,7 +106,8 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}
-struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int max)
+struct strbuf **strbuf_split_buf(const char *str, size_t slen,
+ int terminator, int max)
{
struct strbuf **ret = NULL;
size_t nr = 0, alloc = 0;
@@ -115,7 +116,7 @@ struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int ma
while (slen) {
int len = slen;
if (max <= 0 || nr + 1 < max) {
- const char *end = memchr(str, delim, slen);
+ const char *end = memchr(str, terminator, slen);
if (end)
len = end - str + 1;
}