diff options
author | Jeff King <peff@peff.net> | 2024-03-12 05:17:37 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-12 13:28:10 -0700 |
commit | 600559b7169c1353e3d46f773f39cf018d38ebbc (patch) | |
tree | 140bfd7ddfd762cee4e25aec1e2d110645f3b998 /add-patch.c | |
parent | f99e1d94f5ed72fd7c5115a814b1087fde919fe5 (diff) | |
download | git-600559b7169c1353e3d46f773f39cf018d38ebbc.tar.gz |
find multi-byte comment chars in NUL-terminated strings
Several parts of the code need to identify lines that begin with the
comment character, and do so with a simple byte equality check. As part
of the transition to handling multi-byte characters, we need to match
all of the bytes. For cases where we are looking in a NUL-terminated
string, we can just use starts_with(), which checks all of the
characters in comment_line_str.
Note that we can drop the "line.len" check in wt-status.c's
read_rebase_todolist(). The starts_with() function handles the case of
an empty haystack buffer (it will always return false for a non-empty
prefix).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'add-patch.c')
-rw-r--r-- | add-patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/add-patch.c b/add-patch.c index 4a10237d50..d599ca53e1 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1139,7 +1139,7 @@ static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk) for (i = 0; i < s->buf.len; ) { size_t next = find_next_line(&s->buf, i); - if (s->buf.buf[i] != comment_line_char) + if (!starts_with(s->buf.buf + i, comment_line_str)) strbuf_add(&s->plain, s->buf.buf + i, next - i); i = next; } |