diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-01-30 11:35:46 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 13:03:45 -0800 |
commit | 145136a95a8755528aa012a4ce0ed50d1ec39e24 (patch) | |
tree | cdb54dc3d1730adf84bff93e743f55414ea8ea0e /remote-curl.c | |
parent | d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff) | |
download | git-145136a95a8755528aa012a4ce0ed50d1ec39e24.tar.gz |
C: use skip_prefix() to avoid hardcoded string length
We often skip an optional prefix in a string with a hardcoded
constant, e.g.
if (starts_with(string, "prefix"))
string += 6;
which is less error prone when written
skip_prefix(string, "prefix", &string);
Note that this changes a few error messages from "git reflog expire
--expire=nonsense.timestamp", which used to complain by saying
'--expire=nonsense.timestamp' is not a valid timestamp
but with this change, we say
'nonsense.timestamp' is not a valid timestamp
which is more technically correct (the string with --expire= as
a prefix obviously cannot be a valid timestamp, but the error is
about the part of the input without that prefix).
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote-curl.c')
-rw-r--r-- | remote-curl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remote-curl.c b/remote-curl.c index 350d92a074..8eb96152f5 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -1255,8 +1255,9 @@ static void parse_push(struct strbuf *buf) int ret; do { - if (starts_with(buf->buf, "push ")) - argv_array_push(&specs, buf->buf + 5); + const char *arg; + if (skip_prefix(buf->buf, "push ", &arg)) + argv_array_push(&specs, arg); else die(_("http transport does not support %s"), buf->buf); |