diff options
author | Jeff King <peff@peff.net> | 2016-06-23 13:33:57 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-23 11:32:51 -0700 |
commit | ae989a61dad98debe9899823ca987305f8e8020d (patch) | |
tree | 72cf418dce266b14852818aacc09953f6ecef187 /git-compat-util.h | |
parent | adb3356664fbf15646fd90eb1d5ddd9e66ce913f (diff) | |
download | git-ae989a61dad98debe9899823ca987305f8e8020d.tar.gz |
add skip_prefix_mem helper
The skip_prefix function has been very useful for
simplifying pointer arithmetic and avoiding repeated magic
numbers, but we have no equivalent for length-limited
buffers. So we're stuck with:
if (3 <= len && skip_prefix(buf, "foo", &buf))
len -= 3;
That's not that complicated, but it needs to use magic
numbers for the length of the prefix (or else write out
strlen("foo"), repeating the string). By using a helper, we
can get the string length behind the scenes (and often at
compile time for string literals).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 061e33c774..8e808c01d2 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -464,6 +464,23 @@ static inline int skip_prefix(const char *str, const char *prefix, } /* + * Like skip_prefix, but promises never to read past "len" bytes of the input + * buffer, and returns the remaining number of bytes in "out" via "outlen". + */ +static inline int skip_prefix_mem(const char *buf, size_t len, + const char *prefix, + const char **out, size_t *outlen) +{ + size_t prefix_len = strlen(prefix); + if (prefix_len <= len && !memcmp(buf, prefix, prefix_len)) { + *out = buf + prefix_len; + *outlen = len - prefix_len; + return 1; + } + return 0; +} + +/* * If buf ends with suffix, return 1 and subtract the length of the suffix * from *len. Otherwise, return 0 and leave *len untouched. */ |