diff options
| author | наб <nabijaczleweli@nabijaczleweli.xyz> | 2023-04-23 02:55:05 +0200 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2023-05-01 09:08:59 -0400 |
| commit | be9ad3004f65b54dd6cc0325315559c72396bc1c (patch) | |
| tree | b15df41c48f09b2caf8bd1a2e2a6740a86f869de /include | |
| parent | e2b3d7f4853124746178148cf3f2af4e9c23f73d (diff) | |
| download | glibc-be9ad3004f65b54dd6cc0325315559c72396bc1c.tar.gz glibc-be9ad3004f65b54dd6cc0325315559c72396bc1c.tar.xz glibc-be9ad3004f65b54dd6cc0325315559c72396bc1c.zip | |
Fix regex type usage
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/regex.h | 22 |
1 files changed, 11 insertions, 11 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) |