Skip to content

Commit 9eebe11

Browse files
committed
Merge branch 'jk/c23-const-preserving-fixes-more' into next
Further work to adjust the codebase for C23 that changes functions like strchr() that discarded constness when they return a pointer into a const string to preserve constness. * jk/c23-const-preserving-fixes-more: git-compat-util: fix CONST_OUTPARAM typo and indentation
2 parents 598a273 + 58589c2 commit 9eebe11

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

git-compat-util.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ report_fn get_warn_routine(void);
464464
void set_die_is_recursing_routine(int (*routine)(void));
465465

466466
/*
467-
* Check that an out-parameter that is "at least as const as" a matching
467+
* Check that an out-parameter is "at least as const as" a matching
468468
* in-parameter. For example, skip_prefix() will return "out" that is a subset
469469
* of "str". So:
470470
*
@@ -476,7 +476,7 @@ void set_die_is_recursing_routine(int (*routine)(void));
476476
* See the skip_prefix macro below for an example of use.
477477
*/
478478
#define CONST_OUTPARAM(in, out) \
479-
((const char **)(0 ? ((*(out) = (in)),(out)) : (out)))
479+
((const char **)(0 ? ((*(out) = (in)),(out)) : (out)))
480480

481481
/*
482482
* If the string "str" begins with the string found in "prefix", return true.

0 commit comments

Comments
 (0)