Re: [PATCH v2 00/21] object_id part 7
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 28, 2017, 19:40 UTC
- Message-ID
- <xmqqfuhxchqq.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170328174214.t5szqndtf4bwsnhz@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> Here's that minor tweak, in case anybody is interested. It's less useful > without that follow-on that touches "eol" more, but perhaps it increases > readability on its own.
Yup, the only thing that the original (with Brian's fix) appears to be more careful about is it tries very hard to avoid setting boc past eoc. As we are not checking "boc != eoc" but doing the comparison, that "careful" appearance does not give us any benefit in practice, other than having to do an extra "eol ? eol+1 : eoc"; the result of this patch is easier to read.
By the way, eoc is "one past the end" of the array that begins at boc, so setting a pointer to eoc+1 may technically be in violation. I do not know how much it matters, though ;-)
Show 38 quoted lines
> -- >8 --
> Subject: [PATCH] receive-pack: simplify eol handling in cert parsing
>
> The queue_commands_from_cert() function wants to handle each
> line of the cert individually. It looks for "\n" in the
> to-be-parsed bytes, and special-cases each use of eol (the
> end-of-line variable) when we didn't find one. Instead, we
> can just set the end-of-line variable to end-of-cert in the
> latter case.
>
> For advancing to the next line, it's OK for us to move our
> pointer past end-of-cert, because our loop condition just
> checks for pointer inequality. And it doesn't even violate
> the ANSI C "no more than one past the end of an array" rule,
> because we know in the worst case we've hit the terminating
> NUL of the strbuf.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> builtin/receive-pack.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
> index 5d9e4da0a..58de2a1a9 100644
> --- a/builtin/receive-pack.c
> +++ b/builtin/receive-pack.c
> @@ -1524,8 +1524,10 @@ static void queue_commands_from_cert(struct command **tail,
>
> while (boc < eoc) {
> const char *eol = memchr(boc, '\n', eoc - boc);
> - tail = queue_command(tail, boc, eol ? eol - boc : eoc - boc);
> - boc = eol ? eol + 1 : eoc;
> + if (!eol)
> + eol = eoc;
> + tail = queue_command(tail, boc, eol - boc);
> + boc = eol + 1;
> }
> }