From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Hamza Mahfooz <someguy@effective-light.com>
Subject: Re: [PATCH 2/5] grep: stop modifying buffer in show_line()
Date: Tue, 21 Sep 2021 00:22:45 -0400 [thread overview]
Message-ID: <YUleFU4QrKb28bDz@nand.local> (raw)
In-Reply-To: <YUlV+RPMHGGfk25d@coredump.intra.peff.net>
On Mon, Sep 20, 2021 at 11:48:09PM -0400, Jeff King wrote:
> When showing lines via grep (or looking for funcnames), we call
> show_line() on a multi-line buffer. It finds the end of line and marks
> it with a NUL. However, we don't need to do so, as the resulting line is
> only used along with its "eol" marker:
>
> - we pass both to next_match(), which takes care to look at only the
> bytes we specified
Thinking aloud, next_match() calls match_next_pattern() which takes eol
as non-const and passes it to match_one_pattern(). And that calls
strip_timestamp(), which would be non-const, were it not the previous
patch. So I think this conversion is safe.
> - we pass the line to output_color() without its matching eol marker.
> However, we do use the "match" struct we got from next_match() to
> tell it how many bytes to look at (which can never exceed the string
> we passed it
Yep, makes sense. The patch looks good and matches your description
here.
Thanks,
Taylor
next prev parent reply other threads:[~2021-09-21 4:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 3:45 [PATCH 0/5] const-correctness in grep.c Jeff King
2021-09-21 3:46 ` [PATCH 1/5] grep: stop modifying buffer in strip_timestamp Jeff King
2021-09-21 5:18 ` Carlo Arenas
2021-09-21 5:24 ` Eric Sunshine
2021-09-21 5:40 ` Carlo Arenas
2021-09-21 5:43 ` Jeff King
2021-09-21 6:42 ` Carlo Marcelo Arenas Belón
2021-09-21 7:37 ` René Scharfe
2021-09-21 14:24 ` Jeff King
2021-09-21 21:02 ` Ævar Arnfjörð Bjarmason
2021-09-22 20:20 ` Jeff King
2021-09-23 0:53 ` Ævar Arnfjörð Bjarmason
2021-09-21 3:48 ` [PATCH 2/5] grep: stop modifying buffer in show_line() Jeff King
2021-09-21 4:22 ` Taylor Blau [this message]
2021-09-21 4:42 ` Jeff King
2021-09-21 4:45 ` Taylor Blau
2021-09-21 3:48 ` [PATCH 3/5] grep: stop modifying buffer in grep_source_1() Jeff King
2021-09-21 3:49 ` [PATCH 4/5] grep: mark "haystack" buffers as const Jeff King
2021-09-21 12:04 ` Ævar Arnfjörð Bjarmason
2021-09-21 14:27 ` Jeff King
2021-09-21 3:51 ` [PATCH 5/5] grep: store grep_source buffer " Jeff King
2021-09-21 4:30 ` [PATCH 0/5] const-correctness in grep.c Taylor Blau
2021-09-21 12:07 ` Ævar Arnfjörð Bjarmason
2021-09-21 14:49 ` Jeff King
2021-09-21 12:45 ` [PATCH 6/5] grep.c: mark eol/bol and derived as "const char * const" Ævar Arnfjörð Bjarmason
2021-09-21 14:53 ` Jeff King
2021-09-21 15:17 ` Ævar Arnfjörð Bjarmason
2021-09-21 19:18 ` Jeff King
2021-09-23 13:56 ` Ævar Arnfjörð Bjarmason
2021-09-24 4:22 ` Junio C Hamano
2021-09-22 19:02 ` Junio C Hamano
2021-09-22 18:57 ` [PATCH 0/5] const-correctness in grep.c Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YUleFU4QrKb28bDz@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=someguy@effective-light.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.