compat/regex: fix argument order to calloc(3)
PATCH 1/1 compat/regex: fix argument order to calloc(3)
Windows compiler suddenly started complaining that calloc(3) takes its arguments in <nmemb, size> order. Indeed, there are many calls that has their arguments in a _wrong_ order.
Fix them all.
A sample breakage can be seen at
https://github.com/git/git/actions/runs/9046793153/job/24857988702#step:4:272
---
* I wonder if there is an easier way to deal with toolchain and/or platform changes (I am assuming that is what caused this breakage) than just seeing and then reacting to a breakage after it happens.
compat/regex/regcomp.c | 12 ++++++------ compat/regex/regex_internal.c | 4 ++-- compat/regex/regexec.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-)
compat/regex/regcomp.c +6 -6
@@ -868,7 +868,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)if (table_size > pat_len)break ; - dfa->state_table =calloc (sizeof (struct re_state_table_entry ), table_size); + dfa->state_table =calloc (table_size,sizeof (struct re_state_table_entry )); dfa->state_hash_mask = table_size -1 ; dfa->mb_cur_max =MB_CUR_MAX ;
@@ -936,7 +936,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) {int i, j, ch; - dfa->sb_char = (re_bitset_ptr_t )calloc (sizeof (bitset_t),1 ); + dfa->sb_char = (re_bitset_ptr_t )calloc (1 ,sizeof (bitset_t));if (BE (dfa->sb_char ==NULL ,0 ))return REG_ESPACE ;
@@ -3079,9 +3079,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, _NL_COLLATE_SYMB_EXTRAMB); }#endif - sbcset = (re_bitset_ptr_t )calloc (sizeof (bitset_t),1 ); + sbcset = (re_bitset_ptr_t )calloc (1 ,sizeof (bitset_t));#ifdef RE_ENABLE_I18N - mbcset = (re_charset_t *)calloc (sizeof (re_charset_t),1 ); + mbcset = (re_charset_t *)calloc (1 ,sizeof (re_charset_t));#endif /* RE_ENABLE_I18N */ #ifdef RE_ENABLE_I18N if (BE (sbcset ==NULL || mbcset ==NULL ,0 ))
@@ -3626,9 +3626,9 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,re_token_t br_token;bin_tree_t *tree; - sbcset = (re_bitset_ptr_t )calloc (sizeof (bitset_t),1 ); + sbcset = (re_bitset_ptr_t )calloc (1 ,sizeof (bitset_t));#ifdef RE_ENABLE_I18N - mbcset = (re_charset_t *)calloc (sizeof (re_charset_t),1 ); + mbcset = (re_charset_t *)calloc (1 ,sizeof (re_charset_t));#endif /* RE_ENABLE_I18N */ #ifdef RE_ENABLE_I18N
compat/regex/regex_internal.c +2 -2
@@ -1628,7 +1628,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,reg_errcode_t err;re_dfastate_t *newstate; - newstate = (re_dfastate_t *)calloc (sizeof (re_dfastate_t),1 ); + newstate = (re_dfastate_t *)calloc (1 ,sizeof (re_dfastate_t));if (BE (newstate ==NULL ,0 ))return NULL ; err =re_node_set_init_copy (&newstate->nodes, nodes);
@@ -1678,7 +1678,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,reg_errcode_t err;re_dfastate_t *newstate; - newstate = (re_dfastate_t *)calloc (sizeof (re_dfastate_t),1 ); + newstate = (re_dfastate_t *)calloc (1 ,sizeof (re_dfastate_t));if (BE (newstate ==NULL ,0 ))return NULL ; err =re_node_set_init_copy (&newstate->nodes, nodes);
compat/regex/regexec.c +5 -5
@@ -2796,8 +2796,8 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)continue ;/* No. */ if (sub_top->path ==NULL ) { - sub_top->path =calloc (sizeof (state_array_t), - sl_str - sub_top->str_idx +1 ); + sub_top->path =calloc (sl_str - sub_top->str_idx +1 , +sizeof (state_array_t));if (sub_top->path ==NULL )return REG_ESPACE ; }
@@ -3361,7 +3361,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)if (ndests ==0 ) { state->trtable = (re_dfastate_t **) -calloc (sizeof (re_dfastate_t *),SBC_MAX ); +calloc (SBC_MAX ,sizeof (re_dfastate_t *));return 1 ; }return 0 ;
@@ -3457,7 +3457,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)discern by looking at the character code: allocate a 256-entry transition table. */ trtable = state->trtable = - (re_dfastate_t **)calloc (sizeof (re_dfastate_t *),SBC_MAX ); + (re_dfastate_t **)calloc (SBC_MAX ,sizeof (re_dfastate_t *));if (BE (trtable ==NULL ,0 )) goto out_free;
@@ -3488,7 +3488,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)transition tables, one starting at trtable[0] and one starting at trtable[SBC_MAX]. */ trtable = state->word_trtable = - (re_dfastate_t **)calloc (sizeof (re_dfastate_t *),2 *SBC_MAX ); + (re_dfastate_t **)calloc (2 *SBC_MAX ,sizeof (re_dfastate_t *));if (BE (trtable ==NULL ,0 )) goto out_free;
Signature · 1 line
2.45.0-119-g0f3415f1f8
Quoted 3 lines · Junio C Hamano
Windows compiler suddenly started complaining that calloc(3) takes its arguments in <nmemb, size> order. Indeed, there are many calls that has their arguments in a _wrong_ order.
I think this is actually new to GCC 14. The release notes include this bit:
-Walloc-size and -Wcalloc-transposed-args warnings are enabled for C++ as well
It's a bit puzzling that this seemingly only changed for C++, but oh, well.
Quoted 6 lines
Fix them all.
A sample breakage can be seen at
https://github.com/git/git/actions/runs/9046793153/job/24857988702#step:4:272
Quoted 7 lines
Signed-off-by Junio C Hamano <[email protected]>---
* I wonder if there is an easier way to deal with toolchain and/or platform changes (I am assuming that is what caused this breakage) than just seeing and then reacting to a breakage after it happens.
I think the best thing we can do is to be proactive and be faster than our toolchain to enable (sensible) warnings. Over time all the compilers tend to become stricter, and if we are already as strict as possible then chances are less likely that we'll have to do anything about upstream changes.
But other than that I don't really have much of an idea.
The patch itself looks obviously good to me, thanks!