niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix regex type usage

Browse source 
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>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
наб 2023-04-23 02:55:05 +02:00 • committed by Siddhesh Poyarekar
parent e2b3d7f485
commit be9ad3004f
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/regex.h
View file

@ -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) extern int __re_compile_fastmap (struct re_pattern_buffer *buffer)
attribute_hidden; attribute_hidden;
extern int __re_search (struct re_pattern_buffer *buffer, const char *string, extern regoff_t __re_search (struct re_pattern_buffer *buffer, const char *string,
int length, int start, int range, regoff_t length, regoff_t start, regoff_t range,
struct re_registers *regs); struct re_registers *regs);
extern int __re_search_2 extern regoff_t __re_search_2
(struct re_pattern_buffer *buffer, const char *string1, (struct re_pattern_buffer *buffer, const char *string1,
int length1, const char *string2, int length2, regoff_t length1, const char *string2, regoff_t length2,
int start, int range, struct re_registers *regs, int stop); 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, (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, (struct re_pattern_buffer *buffer, const char *string1,
int length1, const char *string2, int length2, regoff_t length1, const char *string2, regoff_t length2,
int start, struct re_registers *regs, int stop); regoff_t start, struct re_registers *regs, regoff_t stop);
extern void __re_set_registers extern void __re_set_registers
(struct re_pattern_buffer *buffer, struct re_registers *regs, (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); extern int __regcomp (regex_t *__preg, const char *__pattern, int __cflags);
libc_hidden_proto (__regcomp) libc_hidden_proto (__regcomp)

8
posix/regcomp.c
View file

@ -2940,7 +2940,7 @@ lookup_collation_sequence_value (bracket_elem_t *br_elem, uint32_t nrules,
static inline reg_errcode_t static inline reg_errcode_t
__attribute__ ((always_inline)) __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, bracket_elem_t *start_elem, bracket_elem_t *end_elem,
re_dfa_t *dfa, reg_syntax_t syntax, uint32_t nrules, re_dfa_t *dfa, reg_syntax_t syntax, uint32_t nrules,
const unsigned char *collseqmb, const char *collseqwc, 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. */ /* There is not enough space, need realloc. */
uint32_t *new_array_start; uint32_t *new_array_start;
uint32_t *new_array_end; uint32_t *new_array_end;
int new_nranges; Idx new_nranges;
/* +1 in case of mbcset->nranges is 0. */ /* +1 in case of mbcset->nranges is 0. */
new_nranges = 2 * mbcset->nranges + 1; 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 static inline reg_errcode_t
__attribute__ ((always_inline)) __attribute__ ((always_inline))
build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, 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, uint32_t nrules, int32_t table_size,
const int32_t *symb_table, const unsigned char *extra) 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. */ /* Not enough, realloc it. */
/* +1 in case of mbcset->ncoll_syms is 0. */ /* +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 /* Use realloc since mbcset->coll_syms is NULL
if *alloc == 0. */ if *alloc == 0. */
int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t, int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,