[PATCH 2/5] grep: stop modifying buffer in show_line()
- From
Jeff King <peff@peff.net>
- Date
- Sep 21, 2021, 03:48 UTC
- Message-ID
- <YUlV+RPMHGGfk25d@coredump.intra.peff.net>
- In-Reply-To
- <YUlVZk1xXulAqdef@coredump.intra.peff.net>
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
- 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).
So we can stop setting and restoring this NUL marker. That makes the code simpler, and will allow us to take a const buffer in a future patch.
Signed-off-by: Jeff King <peff@peff.net> --- grep.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/grep.c b/grep.c index 5b1f2da4d3..70af01d1c1 100644 --- a/grep.c +++ b/grep.c @@ -1239,7 +1239,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol, if (opt->color || opt->only_matching) { regmatch_t match; enum grep_context ctx = GREP_CONTEXT_BODY; - int ch = *eol; int eflags = 0; if (opt->color) { @@ -1254,7 +1253,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol, else if (sign == '=') line_color = opt->colors[GREP_COLOR_FUNCTION]; } - *eol = '\0'; while (next_match(opt, bol, eol, ctx, &match, eflags)) { if (match.rm_so == match.rm_eo) break; @@ -1272,7 +1270,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol, rest -= match.rm_eo; eflags = REG_NOTBOL; } - *eol = ch; } if (!opt->only_matching) { output_color(opt, bol, rest, line_color);
-- 2.33.0.1023.gc687d0d3c8