Message ID | rjisskmfdv6x6ah6rwqexbt7v3cwubp2wkhawlf7vlgvqfhbo7@qbb34k22qzoi |
---|---|
State | New |
Headers | show |
Series | Fix regex type usage | expand |
On 2023-04-22 20:55, наб via Libc-alpha wrote: > include/regex.h had not been updated during the int -> Idx transition, > and the prototypes don't matched the definitions in regexec.c. > > In regcomp.c, most interfaces were updated for Idx, except for two ones > guarded by #if _LIBC. > > Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> > --- LGTM. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> > Please keep me in CC, as I'm not subscribed. > > include/regex.h | 22 +++++++++++----------- > posix/regcomp.c | 8 ++++---- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/regex.h b/include/regex.h > index 34fb67d855..0ab70a63d4 100644 > --- a/include/regex.h > +++ b/include/regex.h > @@ -11,27 +11,27 @@ extern const char *__re_compile_pattern (const char *pattern, size_t length, > extern int __re_compile_fastmap (struct re_pattern_buffer *buffer) > attribute_hidden; > > -extern int __re_search (struct re_pattern_buffer *buffer, const char *string, > - int length, int start, int range, > +extern regoff_t __re_search (struct re_pattern_buffer *buffer, const char *string, > + regoff_t length, regoff_t start, regoff_t range, > struct re_registers *regs); > > -extern int __re_search_2 > +extern regoff_t __re_search_2 > (struct re_pattern_buffer *buffer, const char *string1, > - int length1, const char *string2, int length2, > - int start, int range, struct re_registers *regs, int stop); > + regoff_t length1, const char *string2, regoff_t length2, > + regoff_t start, regoff_t range, struct re_registers *regs, regoff_t stop); > > -extern int __re_match > +extern regoff_t __re_match > (struct re_pattern_buffer *buffer, const char *string, > - int length, int start, struct re_registers *regs); > + regoff_t length, regoff_t start, struct re_registers *regs); > > -extern int __re_match_2 > +extern regoff_t __re_match_2 > (struct re_pattern_buffer *buffer, const char *string1, > - int length1, const char *string2, int length2, > - int start, struct re_registers *regs, int stop); > + regoff_t length1, const char *string2, regoff_t length2, > + regoff_t start, struct re_registers *regs, regoff_t stop); > > extern void __re_set_registers > (struct re_pattern_buffer *buffer, struct re_registers *regs, > - unsigned num_regs, regoff_t *starts, regoff_t *ends); > + __re_size_t num_regs, regoff_t *starts, regoff_t *ends); > > extern int __regcomp (regex_t *__preg, const char *__pattern, int __cflags); > libc_hidden_proto (__regcomp) > diff --git a/posix/regcomp.c b/posix/regcomp.c > index cbd9bfc673..a928ef6c2d 100644 > --- a/posix/regcomp.c > +++ b/posix/regcomp.c > @@ -2940,7 +2940,7 @@ lookup_collation_sequence_value (bracket_elem_t *br_elem, uint32_t nrules, > > static inline reg_errcode_t > __attribute__ ((always_inline)) > -build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, > +build_range_exp (bitset_t sbcset, re_charset_t *mbcset, Idx *range_alloc, > bracket_elem_t *start_elem, bracket_elem_t *end_elem, > re_dfa_t *dfa, reg_syntax_t syntax, uint32_t nrules, > const unsigned char *collseqmb, const char *collseqwc, > @@ -2984,7 +2984,7 @@ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, > /* There is not enough space, need realloc. */ > uint32_t *new_array_start; > uint32_t *new_array_end; > - int new_nranges; > + Idx new_nranges; > > /* +1 in case of mbcset->nranges is 0. */ > new_nranges = 2 * mbcset->nranges + 1; > @@ -3030,7 +3030,7 @@ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, > static inline reg_errcode_t > __attribute__ ((always_inline)) > build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, > - int *coll_sym_alloc, const unsigned char *name, > + Idx *coll_sym_alloc, const unsigned char *name, > uint32_t nrules, int32_t table_size, > const int32_t *symb_table, const unsigned char *extra) > { > @@ -3063,7 +3063,7 @@ build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, > { > /* Not enough, realloc it. */ > /* +1 in case of mbcset->ncoll_syms is 0. */ > - int new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1; > + Idx new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1; > /* Use realloc since mbcset->coll_syms is NULL > if *alloc == 0. */ > int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
diff --git a/include/regex.h b/include/regex.h index 34fb67d855..0ab70a63d4 100644 --- a/include/regex.h +++ b/include/regex.h @@ -11,27 +11,27 @@ extern const char *__re_compile_pattern (const char *pattern, size_t length, extern int __re_compile_fastmap (struct re_pattern_buffer *buffer) attribute_hidden; -extern int __re_search (struct re_pattern_buffer *buffer, const char *string, - int length, int start, int range, +extern regoff_t __re_search (struct re_pattern_buffer *buffer, const char *string, + regoff_t length, regoff_t start, regoff_t range, struct re_registers *regs); -extern int __re_search_2 +extern regoff_t __re_search_2 (struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, int range, struct re_registers *regs, int stop); + regoff_t length1, const char *string2, regoff_t length2, + regoff_t start, regoff_t range, struct re_registers *regs, regoff_t stop); -extern int __re_match +extern regoff_t __re_match (struct re_pattern_buffer *buffer, const char *string, - int length, int start, struct re_registers *regs); + regoff_t length, regoff_t start, struct re_registers *regs); -extern int __re_match_2 +extern regoff_t __re_match_2 (struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, struct re_registers *regs, int stop); + regoff_t length1, const char *string2, regoff_t length2, + regoff_t start, struct re_registers *regs, regoff_t stop); extern void __re_set_registers (struct re_pattern_buffer *buffer, struct re_registers *regs, - unsigned num_regs, regoff_t *starts, regoff_t *ends); + __re_size_t num_regs, regoff_t *starts, regoff_t *ends); extern int __regcomp (regex_t *__preg, const char *__pattern, int __cflags); libc_hidden_proto (__regcomp) diff --git a/posix/regcomp.c b/posix/regcomp.c index cbd9bfc673..a928ef6c2d 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -2940,7 +2940,7 @@ lookup_collation_sequence_value (bracket_elem_t *br_elem, uint32_t nrules, static inline reg_errcode_t __attribute__ ((always_inline)) -build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, +build_range_exp (bitset_t sbcset, re_charset_t *mbcset, Idx *range_alloc, bracket_elem_t *start_elem, bracket_elem_t *end_elem, re_dfa_t *dfa, reg_syntax_t syntax, uint32_t nrules, const unsigned char *collseqmb, const char *collseqwc, @@ -2984,7 +2984,7 @@ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, /* There is not enough space, need realloc. */ uint32_t *new_array_start; uint32_t *new_array_end; - int new_nranges; + Idx new_nranges; /* +1 in case of mbcset->nranges is 0. */ new_nranges = 2 * mbcset->nranges + 1; @@ -3030,7 +3030,7 @@ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, static inline reg_errcode_t __attribute__ ((always_inline)) build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, - int *coll_sym_alloc, const unsigned char *name, + Idx *coll_sym_alloc, const unsigned char *name, uint32_t nrules, int32_t table_size, const int32_t *symb_table, const unsigned char *extra) { @@ -3063,7 +3063,7 @@ build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, { /* Not enough, realloc it. */ /* +1 in case of mbcset->ncoll_syms is 0. */ - int new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1; + Idx new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1; /* Use realloc since mbcset->coll_syms is NULL if *alloc == 0. */ int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
include/regex.h had not been updated during the int -> Idx transition, and the prototypes don't matched the definitions in regexec.c. In regcomp.c, most interfaces were updated for Idx, except for two ones guarded by #if _LIBC. Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> --- Please keep me in CC, as I'm not subscribed. include/regex.h | 22 +++++++++++----------- posix/regcomp.c | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-)