From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Hamza Mahfooz <someguy@effective-light.com>
Subject: [PATCH 3/5] grep: stop modifying buffer in grep_source_1()
Date: Mon, 20 Sep 2021 23:48:44 -0400 [thread overview]
Message-ID: <YUlWHASpQDJehiZH@coredump.intra.peff.net> (raw)
In-Reply-To: <YUlVZk1xXulAqdef@coredump.intra.peff.net>
We find the end of each matching line of a buffer, and then temporarily
write a NUL to turn it into a regular C string. But we don't need to do
so, because the only thing we do in the interim is pass the line and its
length (via an "eol" pointer) to match_line(). And that function should
only look at the bytes we passed it, whether it has a terminating NUL or
not.
We can drop this temporary write in order to simplify the code and make
it easier to use const buffers in more of grep.c.
Signed-off-by: Jeff King <peff@peff.net>
---
grep.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/grep.c b/grep.c
index 70af01d1c1..32c4641443 100644
--- a/grep.c
+++ b/grep.c
@@ -1616,7 +1616,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
bol = gs->buf;
left = gs->size;
while (left) {
- char *eol, ch;
+ char *eol;
int hit;
ssize_t cno;
ssize_t col = -1, icol = -1;
@@ -1637,14 +1637,11 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
&& look_ahead(opt, &left, &lno, &bol))
break;
eol = end_of_line(bol, &left);
- ch = *eol;
- *eol = 0;
if ((ctx == GREP_CONTEXT_HEAD) && (eol == bol))
ctx = GREP_CONTEXT_BODY;
hit = match_line(opt, bol, eol, &col, &icol, ctx, collect_hits);
- *eol = ch;
if (collect_hits)
goto next_line;
--
2.33.0.1023.gc687d0d3c8
next prev parent reply other threads:[~2021-09-21 3:48 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
2021-09-21 4:42 ` Jeff King
2021-09-21 4:45 ` Taylor Blau
2021-09-21 3:48 ` Jeff King [this message]
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=YUlWHASpQDJehiZH@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).