@@ -868,7 +868,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
868868    if  (table_size  >  pat_len )
869869      break ;
870870
871-   dfa -> state_table  =  calloc  (sizeof  (struct  re_state_table_entry ),  table_size );
871+   dfa -> state_table  =  calloc  (table_size ,  sizeof  (struct  re_state_table_entry ));
872872  dfa -> state_hash_mask  =  table_size  -  1 ;
873873
874874  dfa -> mb_cur_max  =  MB_CUR_MAX ;
@@ -936,7 +936,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
936936	{
937937	  int  i , j , ch ;
938938
939- 	  dfa -> sb_char  =  (re_bitset_ptr_t ) calloc  (sizeof  (bitset_t ),  1 );
939+ 	  dfa -> sb_char  =  (re_bitset_ptr_t ) calloc  (1 ,  sizeof  (bitset_t ));
940940	  if  (BE  (dfa -> sb_char  ==  NULL , 0 ))
941941	    return  REG_ESPACE ;
942942
@@ -3079,9 +3079,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
30793079						   _NL_COLLATE_SYMB_EXTRAMB );
30803080    }
30813081#endif 
3082-   sbcset  =  (re_bitset_ptr_t ) calloc  (sizeof  (bitset_t ),  1 );
3082+   sbcset  =  (re_bitset_ptr_t ) calloc  (1 ,  sizeof  (bitset_t ));
30833083#ifdef  RE_ENABLE_I18N 
3084-   mbcset  =  (re_charset_t  * ) calloc  (sizeof  (re_charset_t ),  1 );
3084+   mbcset  =  (re_charset_t  * ) calloc  (1 ,  sizeof  (re_charset_t ));
30853085#endif  /* RE_ENABLE_I18N */ 
30863086#ifdef  RE_ENABLE_I18N 
30873087  if  (BE  (sbcset  ==  NULL  ||  mbcset  ==  NULL , 0 ))
@@ -3626,9 +3626,9 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
36263626  re_token_t  br_token ;
36273627  bin_tree_t  * tree ;
36283628
3629-   sbcset  =  (re_bitset_ptr_t ) calloc  (sizeof  (bitset_t ),  1 );
3629+   sbcset  =  (re_bitset_ptr_t ) calloc  (1 ,  sizeof  (bitset_t ));
36303630#ifdef  RE_ENABLE_I18N 
3631-   mbcset  =  (re_charset_t  * ) calloc  (sizeof  (re_charset_t ),  1 );
3631+   mbcset  =  (re_charset_t  * ) calloc  (1 ,  sizeof  (re_charset_t ));
36323632#endif  /* RE_ENABLE_I18N */ 
36333633
36343634#ifdef  RE_ENABLE_I18N 
0 commit comments