And here's a v2 with some minor changes based on review of round 1:
- move cast in patch 4 to split_cmdline(); note that this makes the
patch totally different from range-diff's perspective - fix NULL/NUL typo
- use _impl() suffix consistently for wrapped functions. I also
reordered the macro definitions a bit for readability. Patch 8 also
does not show up in range-diff (unlike patch 4, you can convince it
to show it with "--creation-factor=80", but the result is not very
readable anyway). [01/12]: convert: add const to fix strchr() warnings
[02/12]: http: add const to fix strchr() warnings
[03/12]: transport-helper: drop const to fix strchr() warnings
[04/12]: pager: explicitly cast away strchr() constness
[05/12]: run-command: explicitly cast away constness when assigning to void
[06/12]: find_last_dir_sep(): convert inline function to macro
[07/12]: pseudo-merge: fix disk reads from find_pseudo_merge()
[08/12]: skip_prefix(): check const match between in and out params
[09/12]: pkt-line: make packet_reader.line non-const
[10/12]: range-diff: drop const to fix strstr() warnings
[11/12]: http: drop const to fix strstr() warning
[12/12]: refs/files-backend: drop const to fix strchr() warning
builtin/receive-pack.c | 7 ++++---
convert.c | 3 ++-
git-compat-util.h | 33 ++++++++++++++++++++++++---------
hex.c | 6 +++---
hex.h | 6 ++++--
http-push.c | 2 +-
http.c | 4 ++--
pager.c | 5 +++--
pkt-line.h | 2 +-
pseudo-merge.c | 32 +++++++++++++++++++-------------
range-diff.c | 2 +-
refs/files-backend.c | 2 +-
run-command.c | 4 ++--
send-pack.c | 7 ++++---
transport-helper.c | 3 ++-
15 files changed, 73 insertions(+), 45 deletions(-)
1: 4b149037ed = 1: 785b9cd5c0 convert: add const to fix strchr() warnings
2: 65eb42692e = 2: 6e4b0b2e50 http: add const to fix strchr() warnings
3: 659dde8201 ! 3: 42ee9437c2 transport-helper: drop const to fix strchr() warnings
@@ Commit message
which causes compilation with some C23 versions of libc (notably recent
glibc) to complain.
- We need "p" to remain writable, since we assign NULL over the space we
+ We need "p" to remain writable, since we assign NUL over the space we
found. We can solve this by also making "key" writable. This works
because it comes from a strbuf, which is itself a writable string.
4: 66018b5ccf < -: ---------- pager: explicitly cast away strchr() constness
-: ---------- > 4: 856a72ded8 pager: explicitly cast away strchr() constness
5: a696a8a4d9 = 5: 8181dcb941 run-command: explicitly cast away constness when assigning to void
6: 32bba4d607 = 6: 2a0830a807 find_last_dir_sep(): convert inline function to macro
7: ddd0798d19 = 7: e5b8820cf0 pseudo-merge: fix disk reads from find_pseudo_merge()
8: d736d1e070 < -: ---------- skip_prefix(): check const match between in and out params
-: ---------- > 8: e87d8b70e2 skip_prefix(): check const match between in and out params
9: 22c8d65229 = 9: ed84dc926b pkt-line: make packet_reader.line non-const
10: 5cca7c109c = 10: ff425ef7c3 range-diff: drop const to fix strstr() warnings
11: 30e7b35073 ! 11: f01ba0616f http: drop const to fix strstr() warning
@@ Commit message
Signed-off-by: Jeff King <peff@peff.net>
## git-compat-util.h ##
-@@ git-compat-util.h: static inline bool skip_iprefix(const char *str, const char *prefix,
- return false;
- }
-
+@@ git-compat-util.h: static inline size_t xsize_t(off_t len)
+ * is done via tolower(), so it is strictly ASCII (no multi-byte characters or
+ * locale-specific conversions).
+ */
+-static inline bool skip_iprefix(const char *str, const char *prefix,
+- const char **out)
+#define skip_iprefix(str, prefix, out) \
-+ skip_iprefix((str), (prefix), CONST_OUTPARAM((str), (out)))
-+
- /*
- * Like skip_prefix_mem, but compare case-insensitively. Note that the
- * comparison is done via tolower(), so it is strictly ASCII (no multi-byte
++ skip_iprefix_impl((str), (prefix), CONST_OUTPARAM((str), (out)))
++static inline bool skip_iprefix_impl(const char *str, const char *prefix,
++ const char **out)
+ {
+ do {
+ if (!*prefix) {
## http.c ##
@@ http.c: static int has_proxy_cert_password(void)
12: 317436aca5 ! 12: d5c971cf26 refs/files-backend: drop const to fix strchr() warning
@@ Commit message
But there's a catch. We derive that source pointer by parsing the line
with parse_oid_hex_algop(), which requires a const pointer for its
out-parameter. We can work around that by teaching it to use our
- CONST_OUTPARAM() trick, just like skip_prefix(). Note that unlike
- skip_prefix(), the function is not inline, so we can't just wrap it
- using the same name (otherwise the actual definition would expand the
- macro, which breaks compilation). So we rename the actual function with
- an "_impl" suffix, and callers will all use the macro.
+ CONST_OUTPARAM() trick, just like skip_prefix().
Signed-off-by: Jeff King <peff@peff.net>
@@ hex.h: char *oid_to_hex(const struct object_id *oid); /* same static buffer
*/
-int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end,
- const struct git_hash_algo *algo);
-+int parse_oid_hex_algop_impl(const char *hex, struct object_id *oid, const char **end,
-+ const struct git_hash_algo *algo);
+#define parse_oid_hex_algop(hex, oid, end, algo) \
+ parse_oid_hex_algop_impl((hex), (oid), CONST_OUTPARAM((hex), (end)), (algo))
++int parse_oid_hex_algop_impl(const char *hex, struct object_id *oid, const char **end,
++ const struct git_hash_algo *algo);
/*
* These functions work like get_oid_hex and parse_oid_hex, but they will parse