diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:25 -0800 |
| commit | 7855effc952777f2fac284e4461743cf5aa20ee6 (patch) | |
| tree | 37cbf589a05604e1d2d3ca2aaaa6ce10867893f1 /add-patch.c | |
| parent | a91de2172dac7e73de2088a7fdfeb532baa3bfca (diff) | |
| parent | fc9fd8065c6049243f50e90f00a847054ca15e28 (diff) | |
| download | git-7855effc952777f2fac284e4461743cf5aa20ee6.tar.xz | |
Merge branch 'cf/c23-const-preserving-strchr-updates-0'
ISO C23 redefines strchr and friends that tradiotionally took
a const pointer and returned a non-const pointer derived from it to
preserve constness (i.e., if you ask for a substring in a const
string, you get a const pointer to the substring). Update code
paths that used non-const pointer to receive their results that did
not have to be non-const to adjust.
* cf/c23-const-preserving-strchr-updates-0:
gpg-interface: remove an unnecessary NULL initialization
global: constify some pointers that are not written to
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 df8f2e6d74..49d6911a32 100644 --- a/add-patch.c +++ b/add-patch.c @@ -342,7 +342,7 @@ static int parse_hunk_header(struct add_p_state *s, struct hunk *hunk) { struct hunk_header *header = &hunk->header; const char *line = s->plain.buf + hunk->start, *p = line; - char *eol = memchr(p, '\n', s->plain.len - hunk->start); + const char *eol = memchr(p, '\n', s->plain.len - hunk->start); if (!eol) eol = s->plain.buf + s->plain.len; |