diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-30 19:35:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 21:03:45 (GMT) |
| commit | 145136a95a8755528aa012a4ce0ed50d1ec39e24 (patch) | |
| tree | cdb54dc3d1730adf84bff93e743f55414ea8ea0e /transport-helper.c | |
| parent | d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff) | |
| download | git-145136a95a8755528aa012a4ce0ed50d1ec39e24.zip git-145136a95a8755528aa012a4ce0ed50d1ec39e24.tar.gz git-145136a95a8755528aa012a4ce0ed50d1ec39e24.tar.bz2 | |
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 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/transport-helper.c b/transport-helper.c index 413d9d8..20a7185 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -404,11 +404,12 @@ static int fetch_with_fetch(struct transport *transport, sendline(data, &buf); while (1) { + const char *name; + if (recvline(data, &buf)) exit(128); - if (starts_with(buf.buf, "lock ")) { - const char *name = buf.buf + 5; + if (skip_prefix(buf.buf, "lock ", &name)) { if (transport->pack_lockfile) warning(_("%s also locked %s"), data->name, name); else |