This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Convert libiberty to use ISO C prototype style 7/n
- From: Gabriel Dos Reis <gdr at integrable-solutions dot net>
- To: gcc-patches at gcc dot gnu dot org
- Date: 28 Mar 2005 10:32:56 +0200
- Subject: Convert libiberty to use ISO C prototype style 7/n
- Organization: Integrable Solutions
This set essentially converts the regex component.
Next, I'll audit libiberty for completeness and submit a patch that
add warning flags to prevent future accidental "regression".
-- Gaby
include/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
* xregex2.h (_RE_ARGS): Remove definition and uses.
libiberty/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 7/n.
* regex.c (PARAMS): Remove definition.
(PREFIX): Unconditionaly define using ISO C ## operator.
(init_syntax_once, extract_number, extract_number_and_incr,
print_fastmap, print_partial_compiled_pattern,
print_compiled_pattern, print_double_string, printchar,
convert_mbs_to_wcs, re_set_syntax, regex_grow_registers,
regex_compile, store_op1, store_op2, insert_op1, insert_op2,
at_begline_loc_p, at_endline_p, group_in_compile_stack,
insert_space, wcs_compile_range, byte_compile_range,
truncate_wchar, re_compile_fastmap, re_compile_fastmap,
re_set_registers, re_search, re_search_2, re_search_3, re_match,
re_match_2, count_mbs_length, wcs_re_match_2_internal,
byte_re_match_2_internal, group_match_null_string_p,
alt_match_null_string_p, common_op_match_null_string_p,
bcmp_translate, re_compile_pattern, re_comp, re_exec, regcomp,
regexec, regerror, regfree): Use ISO C prototype style.
* partition.c: (elem_compare): Likewise.
* cp-demangle.c (print_usage): Likewise.
Index: include/xregex2.h
===================================================================
RCS file: /cvs/gcc/gcc/include/xregex2.h,v
retrieving revision 1.3
diff -p -r1.3 xregex2.h
*** include/xregex2.h 17 Apr 2002 00:12:54 -0000 1.3
--- include/xregex2.h 28 Mar 2005 08:29:24 -0000
*************** typedef struct
*** 434,465 ****
unfortunately clutters up the declarations a bit, but I think it's
worth it. */
- #if __STDC__
-
- # define _RE_ARGS(args) args
-
- #else /* not __STDC__ */
-
- # define _RE_ARGS(args) ()
-
- #endif /* not __STDC__ */
-
/* Sets the current default syntax to SYNTAX, and return the old syntax.
You can also simply assign to the `re_syntax_options' variable. */
! extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
/* Compile the regular expression PATTERN, with length LENGTH
and syntax given by the global `re_syntax_options', into the buffer
BUFFER. Return NULL if successful, and an error string if not. */
! extern const char *re_compile_pattern
! _RE_ARGS ((const char *pattern, size_t length,
! struct re_pattern_buffer *buffer));
/* Compile a fastmap for the compiled pattern in BUFFER; used to
accelerate searches. Return 0 if successful and -2 if was an
internal error. */
! extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
/* Search in the string STRING (with length LENGTH) for the pattern
--- 434,454 ----
unfortunately clutters up the declarations a bit, but I think it's
worth it. */
/* Sets the current default syntax to SYNTAX, and return the old syntax.
You can also simply assign to the `re_syntax_options' variable. */
! extern reg_syntax_t re_set_syntax (reg_syntax_t syntax);
/* Compile the regular expression PATTERN, with length LENGTH
and syntax given by the global `re_syntax_options', into the buffer
BUFFER. Return NULL if successful, and an error string if not. */
! extern const char *re_compile_pattern (const char *pattern, size_t length,
! struct re_pattern_buffer *buffer);
/* Compile a fastmap for the compiled pattern in BUFFER; used to
accelerate searches. Return 0 if successful and -2 if was an
internal error. */
! extern int re_compile_fastmap (struct re_pattern_buffer *buffer);
/* Search in the string STRING (with length LENGTH) for the pattern
*************** extern int re_compile_fastmap _RE_ARGS (
*** 467,497 ****
characters. Return the starting position of the match, -1 for no
match, or -2 for an internal error. Also return register
information in REGS (if REGS and BUFFER->no_sub are nonzero). */
! extern int re_search
! _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
! int length, int start, int range, struct re_registers *regs));
/* Like `re_search', but search in the concatenation of STRING1 and
STRING2. Also, stop searching at index START + STOP. */
! extern int re_search_2
! _RE_ARGS ((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));
/* Like `re_search', but return how many characters in STRING the regexp
in BUFFER matched, starting at position START. */
! extern int re_match
! _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
! int length, int start, struct re_registers *regs));
/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
! extern int re_match_2
! _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
! int length1, const char *string2, int length2,
! int start, struct re_registers *regs, int stop));
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
--- 456,484 ----
characters. Return the starting position of the match, -1 for no
match, or -2 for an internal error. Also return register
information in REGS (if REGS and BUFFER->no_sub are nonzero). */
! extern int re_search (struct re_pattern_buffer *buffer, const char *string,
! int length, int start, int range,
! struct re_registers *regs);
/* Like `re_search', but search in the concatenation of STRING1 and
STRING2. Also, stop searching at index START + STOP. */
! extern int 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);
/* Like `re_search', but return how many characters in STRING the regexp
in BUFFER matched, starting at position START. */
! extern int re_match (struct re_pattern_buffer *buffer, const char *string,
! int length, int start, struct re_registers *regs);
/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
! extern int 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);
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
*************** extern int re_match_2
*** 506,520 ****
Unless this function is called, the first search or match using
PATTERN_BUFFER will allocate its own register data, without
freeing the old data. */
! extern void re_set_registers
! _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
! unsigned num_regs, regoff_t *starts, regoff_t *ends));
#if defined _REGEX_RE_COMP || defined _LIBC
# ifndef _CRAY
/* 4.2 bsd compatibility. */
! extern char *re_comp _RE_ARGS ((const char *));
! extern int re_exec _RE_ARGS ((const char *));
# endif
#endif
--- 493,508 ----
Unless this function is called, the first search or match using
PATTERN_BUFFER will allocate its own register data, without
freeing the old data. */
! extern void re_set_registers (struct re_pattern_buffer *buffer,
! struct re_registers *regs,
! unsigned num_regs, regoff_t *starts,
! regoff_t *ends);
#if defined _REGEX_RE_COMP || defined _LIBC
# ifndef _CRAY
/* 4.2 bsd compatibility. */
! extern char *re_comp (const char *);
! extern int re_exec (const char *);
# endif
#endif
*************** extern int re_exec _RE_ARGS ((const char
*** 541,559 ****
#endif
/* POSIX compatibility. */
! extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
! const char *__restrict __pattern,
! int __cflags));
!
! extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
! const char *__restrict __string, size_t __nmatch,
! regmatch_t __pmatch[__restrict_arr],
! int __eflags));
! extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
! char *__errbuf, size_t __errbuf_size));
! extern void regfree _RE_ARGS ((regex_t *__preg));
#ifdef __cplusplus
--- 529,547 ----
#endif
/* POSIX compatibility. */
! extern int regcomp (regex_t *__restrict __preg,
! const char *__restrict __pattern,
! int __cflags);
!
! extern int regexec (const regex_t *__restrict __preg,
! const char *__restrict __string, size_t __nmatch,
! regmatch_t __pmatch[__restrict_arr],
! int __eflags);
! extern size_t regerror (int __errcode, const regex_t *__preg,
! char *__errbuf, size_t __errbuf_size);
! extern void regfree (regex_t *__preg);
#ifdef __cplusplus
Index: libiberty/cp-demangle.c
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/cp-demangle.c,v
retrieving revision 1.77
diff -p -r1.77 cp-demangle.c
*** libiberty/cp-demangle.c 26 Mar 2005 19:24:32 -0000 1.77
--- libiberty/cp-demangle.c 28 Mar 2005 08:29:26 -0000
*************** is_gnu_v3_mangled_dtor (const char *name
*** 4144,4150 ****
#include "getopt.h"
#include "dyn-string.h"
! static void print_usage PARAMS ((FILE* fp, int exit_value));
#define IS_ALPHA(CHAR) \
(((CHAR) >= 'a' && (CHAR) <= 'z') \
--- 4144,4150 ----
#include "getopt.h"
#include "dyn-string.h"
! static void print_usage (FILE* fp, int exit_value);
#define IS_ALPHA(CHAR) \
(((CHAR) >= 'a' && (CHAR) <= 'z') \
Index: libiberty/partition.c
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/partition.c,v
retrieving revision 1.6
diff -p -r1.6 partition.c
*** libiberty/partition.c 28 Mar 2005 04:22:33 -0000 1.6
--- libiberty/partition.c 28 Mar 2005 08:29:26 -0000
***************
*** 34,40 ****
#include "libiberty.h"
#include "partition.h"
! static int elem_compare PARAMS ((const void *, const void *));
/* Creates a partition of NUM_ELEMENTS elements. Initially each
element is in a class by itself. */
--- 34,40 ----
#include "libiberty.h"
#include "partition.h"
! static int elem_compare (const void *, const void *);
/* Creates a partition of NUM_ELEMENTS elements. Initially each
element is in a class by itself. */
Index: libiberty/regex.c
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/regex.c,v
retrieving revision 1.16
diff -p -r1.16 regex.c
*** libiberty/regex.c 20 Nov 2004 02:44:34 -0000 1.16
--- libiberty/regex.c 28 Mar 2005 08:29:26 -0000
***************
*** 40,53 ****
#include <ansidecl.h>
- #ifndef PARAMS
- # if defined __GNUC__ || (defined __STDC__ && __STDC__)
- # define PARAMS(args) args
- # else
- # define PARAMS(args) ()
- # endif /* GCC. */
- #endif /* Not PARAMS. */
-
#ifndef INSIDE_RECURSION
# if defined STDC_HEADERS && !defined emacs
--- 40,45 ----
*************** extern char *re_syntax_table;
*** 277,286 ****
static char re_syntax_table[CHAR_SET_SIZE];
! static void init_syntax_once PARAMS ((void));
static void
! init_syntax_once ()
{
register int c;
static int done = 0;
--- 269,278 ----
static char re_syntax_table[CHAR_SET_SIZE];
! static void init_syntax_once (void);
static void
! init_syntax_once (void)
{
register int c;
static int done = 0;
*************** typedef char boolean;
*** 411,454 ****
# define false 0
# define true 1
! static reg_errcode_t byte_regex_compile _RE_ARGS ((const char *pattern, size_t size,
! reg_syntax_t syntax,
! struct re_pattern_buffer *bufp));
!
! static int byte_re_match_2_internal PARAMS ((struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int pos,
! struct re_registers *regs,
! int stop));
! static int byte_re_search_2 PARAMS ((struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int startpos, int range,
! struct re_registers *regs, int stop));
! static int byte_re_compile_fastmap PARAMS ((struct re_pattern_buffer *bufp));
#ifdef MBS_SUPPORT
! static reg_errcode_t wcs_regex_compile _RE_ARGS ((const char *pattern, size_t size,
! reg_syntax_t syntax,
! struct re_pattern_buffer *bufp));
!
!
! static int wcs_re_match_2_internal PARAMS ((struct re_pattern_buffer *bufp,
! const char *cstring1, int csize1,
! const char *cstring2, int csize2,
! int pos,
! struct re_registers *regs,
! int stop,
! wchar_t *string1, int size1,
! wchar_t *string2, int size2,
! int *mbs_offset1, int *mbs_offset2));
! static int wcs_re_search_2 PARAMS ((struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int startpos, int range,
! struct re_registers *regs, int stop));
! static int wcs_re_compile_fastmap PARAMS ((struct re_pattern_buffer *bufp));
#endif
/* These are the command codes that appear in compiled regular
--- 403,446 ----
# define false 0
# define true 1
! static reg_errcode_t byte_regex_compile (const char *pattern, size_t size,
! reg_syntax_t syntax,
! struct re_pattern_buffer *bufp);
!
! static int byte_re_match_2_internal (struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int pos,
! struct re_registers *regs,
! int stop);
! static int byte_re_search_2 (struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int startpos, int range,
! struct re_registers *regs, int stop);
! static int byte_re_compile_fastmap (struct re_pattern_buffer *bufp);
#ifdef MBS_SUPPORT
! static reg_errcode_t wcs_regex_compile (const char *pattern, size_t size,
! reg_syntax_t syntax,
! struct re_pattern_buffer *bufp);
!
!
! static int wcs_re_match_2_internal (struct re_pattern_buffer *bufp,
! const char *cstring1, int csize1,
! const char *cstring2, int csize2,
! int pos,
! struct re_registers *regs,
! int stop,
! wchar_t *string1, int size1,
! wchar_t *string2, int size2,
! int *mbs_offset1, int *mbs_offset2);
! static int wcs_re_search_2 (struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int startpos, int range,
! struct re_registers *regs, int stop);
! static int wcs_re_compile_fastmap (struct re_pattern_buffer *bufp);
#endif
/* These are the command codes that appear in compiled regular
*************** typedef enum
*** 616,626 ****
# define UCHAR_T unsigned char
# define COMPILED_BUFFER_VAR bufp->buffer
# define OFFSET_ADDRESS_SIZE 2
! # if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
! # define PREFIX(name) byte_##name
! # else
! # define PREFIX(name) byte_/**/name
! # endif
# define ARG_PREFIX(name) name
# define PUT_CHAR(c) putchar (c)
#else
--- 608,614 ----
# define UCHAR_T unsigned char
# define COMPILED_BUFFER_VAR bufp->buffer
# define OFFSET_ADDRESS_SIZE 2
! # define PREFIX(name) byte_##name
# define ARG_PREFIX(name) name
# define PUT_CHAR(c) putchar (c)
#else
*************** typedef enum
*** 630,642 ****
# define COMPILED_BUFFER_VAR wc_buffer
# define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */
# define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_T)+1)
! # if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
! # define PREFIX(name) wcs_##name
! # define ARG_PREFIX(name) c##name
! # else
! # define PREFIX(name) wcs_/**/name
! # define ARG_PREFIX(name) c/**/name
! # endif
/* Should we use wide stream?? */
# define PUT_CHAR(c) printf ("%C", c);
# define TRUE 1
--- 618,625 ----
# define COMPILED_BUFFER_VAR wc_buffer
# define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */
# define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_T)+1)
! # define PREFIX(name) wcs_##name
! # define ARG_PREFIX(name) c##name
/* Should we use wide stream?? */
# define PUT_CHAR(c) printf ("%C", c);
# define TRUE 1
*************** typedef enum
*** 703,713 ****
# endif
# ifdef DEBUG
! static void PREFIX(extract_number) _RE_ARGS ((int *dest, UCHAR_T *source));
static void
! PREFIX(extract_number) (dest, source)
! int *dest;
! UCHAR_T *source;
{
# ifdef WCHAR
*dest = *source;
--- 686,694 ----
# endif
# ifdef DEBUG
! static void PREFIX(extract_number) (int *dest, UCHAR_T *source);
static void
! PREFIX(extract_number) (int *dest, UCHAR_T *source)
{
# ifdef WCHAR
*dest = *source;
*************** PREFIX(extract_number) (dest, source)
*** 735,746 ****
} while (0)
# ifdef DEBUG
! static void PREFIX(extract_number_and_incr) _RE_ARGS ((int *destination,
! UCHAR_T **source));
static void
! PREFIX(extract_number_and_incr) (destination, source)
! int *destination;
! UCHAR_T **source;
{
PREFIX(extract_number) (destination, *source);
*source += OFFSET_ADDRESS_SIZE;
--- 716,725 ----
} while (0)
# ifdef DEBUG
! static void PREFIX(extract_number_and_incr) (int *destination,
! UCHAR_T **source);
static void
! PREFIX(extract_number_and_incr) (int *destination, UCHAR_T **source)
{
PREFIX(extract_number) (destination, *source);
*source += OFFSET_ADDRESS_SIZE;
*************** static int debug;
*** 791,798 ****
# ifndef DEFINED_ONCE
void
! print_fastmap (fastmap)
! char *fastmap;
{
unsigned was_a_range = 0;
unsigned i = 0;
--- 770,776 ----
# ifndef DEFINED_ONCE
void
! print_fastmap (char *fastmap)
{
unsigned was_a_range = 0;
unsigned i = 0;
*************** print_fastmap (fastmap)
*** 824,832 ****
the START pointer into it and ending just before the pointer END. */
void
! PREFIX(print_partial_compiled_pattern) (start, end)
! UCHAR_T *start;
! UCHAR_T *end;
{
int mcnt, mcnt2;
UCHAR_T *p1;
--- 802,808 ----
the START pointer into it and ending just before the pointer END. */
void
! PREFIX(print_partial_compiled_pattern) (UCHAR_T *start, UCHAR_T *end)
{
int mcnt, mcnt2;
UCHAR_T *p1;
*************** PREFIX(print_partial_compiled_pattern) (
*** 1159,1166 ****
void
! PREFIX(print_compiled_pattern) (bufp)
! struct re_pattern_buffer *bufp;
{
UCHAR_T *buffer = (UCHAR_T*) bufp->buffer;
--- 1135,1141 ----
void
! PREFIX(print_compiled_pattern) (struct re_pattern_buffer *bufp)
{
UCHAR_T *buffer = (UCHAR_T*) bufp->buffer;
*************** PREFIX(print_compiled_pattern) (bufp)
*** 1192,1203 ****
void
! PREFIX(print_double_string) (where, string1, size1, string2, size2)
! const CHAR_T *where;
! const CHAR_T *string1;
! const CHAR_T *string2;
! int size1;
! int size2;
{
int this_char;
--- 1167,1174 ----
void
! PREFIX(print_double_string) (const CHAR_T *where, const CHAR_T *string1,
! int size1, const CHAR_T *string2, int size2)
{
int this_char;
*************** PREFIX(print_double_string) (where, stri
*** 1230,1237 ****
# ifndef DEFINED_ONCE
void
! printchar (c)
! int c;
{
putc (c, stderr);
}
--- 1201,1207 ----
# ifndef DEFINED_ONCE
void
! printchar (int c)
{
putc (c, stderr);
}
*************** static size_t convert_mbs_to_wcs (CHAR_T
*** 1268,1278 ****
size_t len, int *offset_buffer,
char *is_binary);
static size_t
! convert_mbs_to_wcs (dest, src, len, offset_buffer, is_binary)
! CHAR_T *dest;
! const unsigned char* src;
! size_t len; /* the length of multibyte string. */
!
/* It hold correspondances between src(char string) and
dest(wchar_t string) for optimization.
e.g. src = "xxxyzz"
--- 1238,1245 ----
size_t len, int *offset_buffer,
char *is_binary);
static size_t
! convert_mbs_to_wcs (CHAR_T *dest, const unsigned char*src, size_t len,
! int *offset_buffer, char *is_binary)
/* It hold correspondances between src(char string) and
dest(wchar_t string) for optimization.
e.g. src = "xxxyzz"
*************** convert_mbs_to_wcs (dest, src, len, offs
*** 1282,1289 ****
offset_buffer = {0, 0+3("xxx"), 0+3+1("y"), 0+3+1+2("zz")}
= {0, 3, 4, 6}
*/
- int *offset_buffer;
- char *is_binary;
{
wchar_t *pdest = dest;
const unsigned char *psrc = src;
--- 1249,1254 ----
*************** reg_syntax_t re_syntax_options;
*** 1354,1361 ****
defined in regex.h. We return the old syntax. */
reg_syntax_t
! re_set_syntax (syntax)
! reg_syntax_t syntax;
{
reg_syntax_t ret = re_syntax_options;
--- 1319,1325 ----
defined in regex.h. We return the old syntax. */
reg_syntax_t
! re_set_syntax (reg_syntax_t syntax)
{
reg_syntax_t ret = re_syntax_options;
*************** static CHAR_T PREFIX(reg_unset_dummy);
*** 1874,1908 ****
# define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
/* Subroutine declarations and macros for regex_compile. */
! static void PREFIX(store_op1) _RE_ARGS ((re_opcode_t op, UCHAR_T *loc, int arg));
! static void PREFIX(store_op2) _RE_ARGS ((re_opcode_t op, UCHAR_T *loc,
! int arg1, int arg2));
! static void PREFIX(insert_op1) _RE_ARGS ((re_opcode_t op, UCHAR_T *loc,
! int arg, UCHAR_T *end));
! static void PREFIX(insert_op2) _RE_ARGS ((re_opcode_t op, UCHAR_T *loc,
! int arg1, int arg2, UCHAR_T *end));
! static boolean PREFIX(at_begline_loc_p) _RE_ARGS ((const CHAR_T *pattern,
! const CHAR_T *p,
! reg_syntax_t syntax));
! static boolean PREFIX(at_endline_loc_p) _RE_ARGS ((const CHAR_T *p,
! const CHAR_T *pend,
! reg_syntax_t syntax));
# ifdef WCHAR
! static reg_errcode_t wcs_compile_range _RE_ARGS ((CHAR_T range_start,
! const CHAR_T **p_ptr,
! const CHAR_T *pend,
! char *translate,
! reg_syntax_t syntax,
! UCHAR_T *b,
! CHAR_T *char_set));
! static void insert_space _RE_ARGS ((int num, CHAR_T *loc, CHAR_T *end));
# else /* BYTE */
! static reg_errcode_t byte_compile_range _RE_ARGS ((unsigned int range_start,
! const char **p_ptr,
! const char *pend,
! char *translate,
! reg_syntax_t syntax,
! unsigned char *b));
# endif /* WCHAR */
/* Fetch the next character in the uncompiled pattern---translating it
--- 1838,1872 ----
# define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
/* Subroutine declarations and macros for regex_compile. */
! static void PREFIX(store_op1) (re_opcode_t op, UCHAR_T *loc, int arg);
! static void PREFIX(store_op2) (re_opcode_t op, UCHAR_T *loc,
! int arg1, int arg2);
! static void PREFIX(insert_op1) (re_opcode_t op, UCHAR_T *loc,
! int arg, UCHAR_T *end);
! static void PREFIX(insert_op2) (re_opcode_t op, UCHAR_T *loc,
! int arg1, int arg2, UCHAR_T *end);
! static boolean PREFIX(at_begline_loc_p) (const CHAR_T *pattern,
! const CHAR_T *p,
! reg_syntax_t syntax);
! static boolean PREFIX(at_endline_loc_p) (const CHAR_T *p,
! const CHAR_T *pend,
! reg_syntax_t syntax);
# ifdef WCHAR
! static reg_errcode_t wcs_compile_range (CHAR_T range_start,
! const CHAR_T **p_ptr,
! const CHAR_T *pend,
! char *translate,
! reg_syntax_t syntax,
! UCHAR_T *b,
! CHAR_T *char_set);
! static void insert_space (int num, CHAR_T *loc, CHAR_T *end);
# else /* BYTE */
! static reg_errcode_t byte_compile_range (unsigned int range_start,
! const char **p_ptr,
! const char *pend,
! char *translate,
! reg_syntax_t syntax,
! unsigned char *b);
# endif /* WCHAR */
/* Fetch the next character in the uncompiled pattern---translating it
*************** static PREFIX(register_info_type) *PREFI
*** 2260,2267 ****
but don't make them smaller. */
static void
! PREFIX(regex_grow_registers) (num_regs)
! int num_regs;
{
if (num_regs > regs_allocated_size)
{
--- 2224,2230 ----
but don't make them smaller. */
static void
! PREFIX(regex_grow_registers) (int num_regs)
{
if (num_regs > regs_allocated_size)
{
*************** PREFIX(regex_grow_registers) (num_regs)
*** 2282,2290 ****
# endif /* not MATCH_MAY_ALLOCATE */
# ifndef DEFINED_ONCE
! static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
! compile_stack,
! regnum_t regnum));
# endif /* not DEFINED_ONCE */
/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
--- 2245,2252 ----
# endif /* not MATCH_MAY_ALLOCATE */
# ifndef DEFINED_ONCE
! static boolean group_in_compile_stack (compile_stack_type compile_stack,
! regnum_t regnum);
# endif /* not DEFINED_ONCE */
/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
*************** static boolean group_in_compile_stack _R
*** 2315,2325 ****
# endif /* WCHAR */
static reg_errcode_t
! PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
! const char *ARG_PREFIX(pattern);
! size_t ARG_PREFIX(size);
! reg_syntax_t syntax;
! struct re_pattern_buffer *bufp;
{
/* We fetch characters from PATTERN here. Even though PATTERN is
`char *' (i.e., signed), we declare these variables as unsigned, so
--- 2277,2285 ----
# endif /* WCHAR */
static reg_errcode_t
! PREFIX(regex_compile) (const char *ARG_PREFIX(pattern),
! size_t ARG_PREFIX(size), reg_syntax_t syntax,
! struct re_pattern_buffer *bufp)
{
/* We fetch characters from PATTERN here. Even though PATTERN is
`char *' (i.e., signed), we declare these variables as unsigned, so
*************** PREFIX(regex_compile) (ARG_PREFIX(patter
*** 4264,4273 ****
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(store_op1) (op, loc, arg)
! re_opcode_t op;
! UCHAR_T *loc;
! int arg;
{
*loc = (UCHAR_T) op;
STORE_NUMBER (loc + 1, arg);
--- 4224,4230 ----
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(store_op1) (re_opcode_t op, UCHAR_T *loc, int arg)
{
*loc = (UCHAR_T) op;
STORE_NUMBER (loc + 1, arg);
*************** PREFIX(store_op1) (op, loc, arg)
*** 4278,4287 ****
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(store_op2) (op, loc, arg1, arg2)
! re_opcode_t op;
! UCHAR_T *loc;
! int arg1, arg2;
{
*loc = (UCHAR_T) op;
STORE_NUMBER (loc + 1, arg1);
--- 4235,4241 ----
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(store_op2) (re_opcode_t op, UCHAR_T *loc, int arg1, int arg2)
{
*loc = (UCHAR_T) op;
STORE_NUMBER (loc + 1, arg1);
*************** PREFIX(store_op2) (op, loc, arg1, arg2)
*** 4294,4304 ****
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(insert_op1) (op, loc, arg, end)
! re_opcode_t op;
! UCHAR_T *loc;
! int arg;
! UCHAR_T *end;
{
register UCHAR_T *pfrom = end;
register UCHAR_T *pto = end + 1 + OFFSET_ADDRESS_SIZE;
--- 4248,4254 ----
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(insert_op1) (re_opcode_t op, UCHAR_T *loc, int arg, UCHAR_T *end)
{
register UCHAR_T *pfrom = end;
register UCHAR_T *pto = end + 1 + OFFSET_ADDRESS_SIZE;
*************** PREFIX(insert_op1) (op, loc, arg, end)
*** 4314,4324 ****
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(insert_op2) (op, loc, arg1, arg2, end)
! re_opcode_t op;
! UCHAR_T *loc;
! int arg1, arg2;
! UCHAR_T *end;
{
register UCHAR_T *pfrom = end;
register UCHAR_T *pto = end + 1 + 2 * OFFSET_ADDRESS_SIZE;
--- 4264,4271 ----
/* ifdef WCHAR, integer parameter is 1 wchar_t. */
static void
! PREFIX(insert_op2) (re_opcode_t op, UCHAR_T *loc, int arg1,
! int arg2, UCHAR_T *end)
{
register UCHAR_T *pfrom = end;
register UCHAR_T *pto = end + 1 + 2 * OFFSET_ADDRESS_SIZE;
*************** PREFIX(insert_op2) (op, loc, arg1, arg2,
*** 4335,4343 ****
least one character before the ^. */
static boolean
! PREFIX(at_begline_loc_p) (pattern, p, syntax)
! const CHAR_T *pattern, *p;
! reg_syntax_t syntax;
{
const CHAR_T *prev = p - 2;
boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
--- 4282,4289 ----
least one character before the ^. */
static boolean
! PREFIX(at_begline_loc_p) (const CHAR_T *pattern, const CHAR_T *p,
! reg_syntax_t syntax)
{
const CHAR_T *prev = p - 2;
boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
*************** PREFIX(at_begline_loc_p) (pattern, p, sy
*** 4354,4362 ****
at least one character after the $, i.e., `P < PEND'. */
static boolean
! PREFIX(at_endline_loc_p) (p, pend, syntax)
! const CHAR_T *p, *pend;
! reg_syntax_t syntax;
{
const CHAR_T *next = p;
boolean next_backslash = *next == '\\';
--- 4300,4307 ----
at least one character after the $, i.e., `P < PEND'. */
static boolean
! PREFIX(at_endline_loc_p) (const CHAR_T *p, const CHAR_T *pend,
! reg_syntax_t syntax)
{
const CHAR_T *next = p;
boolean next_backslash = *next == '\\';
*************** PREFIX(at_endline_loc_p) (p, pend, synta
*** 4377,4385 ****
false if it's not. */
static boolean
! group_in_compile_stack (compile_stack, regnum)
! compile_stack_type compile_stack;
! regnum_t regnum;
{
int this_element;
--- 4322,4328 ----
false if it's not. */
static boolean
! group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
{
int this_element;
*************** group_in_compile_stack (compile_stack, r
*** 4399,4408 ****
/* This insert space, which size is "num", into the pattern at "loc".
"end" must point the end of the allocated buffer. */
static void
! insert_space (num, loc, end)
! int num;
! CHAR_T *loc;
! CHAR_T *end;
{
register CHAR_T *pto = end;
register CHAR_T *pfrom = end - num;
--- 4342,4348 ----
/* This insert space, which size is "num", into the pattern at "loc".
"end" must point the end of the allocated buffer. */
static void
! insert_space (int num, CHAR_T *loc, CHAR_T *end)
{
register CHAR_T *pto = end;
register CHAR_T *pfrom = end - num;
*************** insert_space (num, loc, end)
*** 4414,4426 ****
#ifdef WCHAR
static reg_errcode_t
! wcs_compile_range (range_start_char, p_ptr, pend, translate, syntax, b,
! char_set)
! CHAR_T range_start_char;
! const CHAR_T **p_ptr, *pend;
! CHAR_T *char_set, *b;
! RE_TRANSLATE_TYPE translate;
! reg_syntax_t syntax;
{
const CHAR_T *p = *p_ptr;
CHAR_T range_start, range_end;
--- 4354,4362 ----
#ifdef WCHAR
static reg_errcode_t
! wcs_compile_range (CHAR_T range_start_char, const CHAR_T **p_ptr,
! const CHAR_T *pend, RE_TRANSLATE_TYPE translate,
! reg_syntax_t syntax, CHAR_T *b, CHAR_T *char_set)
{
const CHAR_T *p = *p_ptr;
CHAR_T range_start, range_end;
*************** wcs_compile_range (range_start_char, p_p
*** 4501,4512 ****
`regex_compile' itself. */
static reg_errcode_t
! byte_compile_range (range_start_char, p_ptr, pend, translate, syntax, b)
! unsigned int range_start_char;
! const char **p_ptr, *pend;
! RE_TRANSLATE_TYPE translate;
! reg_syntax_t syntax;
! unsigned char *b;
{
unsigned this_char;
const char *p = *p_ptr;
--- 4437,4445 ----
`regex_compile' itself. */
static reg_errcode_t
! byte_compile_range (unsigned int range_start_char, const char **p_ptr,
! const char *pend, RE_TRANSLATE_TYPE translate,
! reg_syntax_t syntax, unsigned char *b)
{
unsigned this_char;
const char *p = *p_ptr;
*************** byte_compile_range (range_start_char, p_
*** 4587,4594 ****
static unsigned char truncate_wchar (CHAR_T c);
static unsigned char
! truncate_wchar (c)
! CHAR_T c;
{
unsigned char buf[MB_CUR_MAX];
mbstate_t state;
--- 4520,4526 ----
static unsigned char truncate_wchar (CHAR_T c);
static unsigned char
! truncate_wchar (CHAR_T c)
{
unsigned char buf[MB_CUR_MAX];
mbstate_t state;
*************** truncate_wchar (c)
*** 4604,4611 ****
#endif /* WCHAR */
static int
! PREFIX(re_compile_fastmap) (bufp)
! struct re_pattern_buffer *bufp;
{
int j, k;
#ifdef MATCH_MAY_ALLOCATE
--- 4536,4542 ----
#endif /* WCHAR */
static int
! PREFIX(re_compile_fastmap) (struct re_pattern_buffer *bufp)
{
int j, k;
#ifdef MATCH_MAY_ALLOCATE
*************** PREFIX(re_compile_fastmap) (bufp)
*** 4924,4931 ****
#else /* not INSIDE_RECURSION */
int
! re_compile_fastmap (bufp)
! struct re_pattern_buffer *bufp;
{
# ifdef MBS_SUPPORT
if (MB_CUR_MAX != 1)
--- 4855,4861 ----
#else /* not INSIDE_RECURSION */
int
! re_compile_fastmap (struct re_pattern_buffer *bufp)
{
# ifdef MBS_SUPPORT
if (MB_CUR_MAX != 1)
*************** weak_alias (__re_compile_fastmap, re_com
*** 4953,4963 ****
freeing the old data. */
void
! re_set_registers (bufp, regs, num_regs, starts, ends)
! struct re_pattern_buffer *bufp;
! struct re_registers *regs;
! unsigned num_regs;
! regoff_t *starts, *ends;
{
if (num_regs)
{
--- 4883,4891 ----
freeing the old data. */
void
! re_set_registers (struct re_pattern_buffer *bufp,
! struct re_registers *regs, unsigned num_regs,
! regoff_t *starts, regoff_t *ends)
{
if (num_regs)
{
*************** weak_alias (__re_set_registers, re_set_r
*** 4983,4993 ****
doesn't let you say where to stop matching. */
int
! re_search (bufp, string, size, startpos, range, regs)
! struct re_pattern_buffer *bufp;
! const char *string;
! int size, startpos, range;
! struct re_registers *regs;
{
return re_search_2 (bufp, NULL, 0, string, size, startpos, range,
regs, size);
--- 4911,4918 ----
doesn't let you say where to stop matching. */
int
! re_search (struct re_pattern_buffer *bufp, const char *string, int size,
! int startpos, int range, struct re_registers *regs)
{
return re_search_2 (bufp, NULL, 0, string, size, startpos, range,
regs, size);
*************** weak_alias (__re_search, re_search)
*** 5019,5032 ****
stack overflow). */
int
! re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
! struct re_pattern_buffer *bufp;
! const char *string1, *string2;
! int size1, size2;
! int startpos;
! int range;
! struct re_registers *regs;
! int stop;
{
# ifdef MBS_SUPPORT
if (MB_CUR_MAX != 1)
--- 4944,4952 ----
stack overflow). */
int
! re_search_2 (struct re_pattern_buffer *bufp, const char *string1, int size1,
! const char *string2, int size2, int startpos, int range,
! struct re_registers *regs, int stop)
{
# ifdef MBS_SUPPORT
if (MB_CUR_MAX != 1)
*************** weak_alias (__re_search_2, re_search_2)
*** 5082,5096 ****
static int
! PREFIX(re_search_2) (bufp, string1, size1, string2, size2, startpos, range,
! regs, stop)
! struct re_pattern_buffer *bufp;
! const char *string1, *string2;
! int size1, size2;
! int startpos;
! int range;
! struct re_registers *regs;
! int stop;
{
int val;
register char *fastmap = bufp->fastmap;
--- 5002,5011 ----
static int
! PREFIX(re_search_2) (struct re_pattern_buffer *bufp, const char *string1,
! int size1, const char *string2, int size2,
! int startpos, int range,
! struct re_registers *regs, int stop)
{
int val;
register char *fastmap = bufp->fastmap;
*************** PREFIX(re_search_2) (bufp, string1, size
*** 5473,5483 ****
/* re_match is like re_match_2 except it takes only a single string. */
int
! re_match (bufp, string, size, pos, regs)
! struct re_pattern_buffer *bufp;
! const char *string;
! int size, pos;
! struct re_registers *regs;
{
int result;
# ifdef MBS_SUPPORT
--- 5388,5395 ----
/* re_match is like re_match_2 except it takes only a single string. */
int
! re_match (struct re_pattern_buffer *bufp, const char *string,
! int size, int pos, struct re_registers *regs)
{
int result;
# ifdef MBS_SUPPORT
*************** weak_alias (__re_match, re_match)
*** 5504,5520 ****
#endif /* not INSIDE_RECURSION */
#ifdef INSIDE_RECURSION
! static boolean PREFIX(group_match_null_string_p) _RE_ARGS ((UCHAR_T **p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info));
! static boolean PREFIX(alt_match_null_string_p) _RE_ARGS ((UCHAR_T *p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info));
! static boolean PREFIX(common_op_match_null_string_p) _RE_ARGS ((UCHAR_T **p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info));
! static int PREFIX(bcmp_translate) _RE_ARGS ((const CHAR_T *s1, const CHAR_T *s2,
! int len, char *translate));
#else /* not INSIDE_RECURSION */
/* re_match_2 matches the compiled pattern in BUFP against the
--- 5416,5432 ----
#endif /* not INSIDE_RECURSION */
#ifdef INSIDE_RECURSION
! static boolean PREFIX(group_match_null_string_p) (UCHAR_T **p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info);
! static boolean PREFIX(alt_match_null_string_p) (UCHAR_T *p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info);
! static boolean PREFIX(common_op_match_null_string_p) (UCHAR_T **p,
! UCHAR_T *end,
! PREFIX(register_info_type) *reg_info);
! static int PREFIX(bcmp_translate) (const CHAR_T *s1, const CHAR_T *s2,
! int len, char *translate);
#else /* not INSIDE_RECURSION */
/* re_match_2 matches the compiled pattern in BUFP against the
*************** static int PREFIX(bcmp_translate) _RE_AR
*** 5531,5543 ****
matched substring. */
int
! re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
! struct re_pattern_buffer *bufp;
! const char *string1, *string2;
! int size1, size2;
! int pos;
! struct re_registers *regs;
! int stop;
{
int result;
# ifdef MBS_SUPPORT
--- 5443,5451 ----
matched substring. */
int
! re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int size1,
! const char *string2, int size2, int pos,
! struct re_registers *regs, int stop)
{
int result;
# ifdef MBS_SUPPORT
*************** weak_alias (__re_match_2, re_match_2)
*** 5566,5572 ****
#ifdef INSIDE_RECURSION
#ifdef WCHAR
! static int count_mbs_length PARAMS ((int *, int));
/* This check the substring (from 0, to length) of the multibyte string,
to which offset_buffer correspond. And count how many wchar_t_characters
--- 5474,5480 ----
#ifdef INSIDE_RECURSION
#ifdef WCHAR
! static int count_mbs_length (int *, int);
/* This check the substring (from 0, to length) of the multibyte string,
to which offset_buffer correspond. And count how many wchar_t_characters
*************** static int count_mbs_length PARAMS ((int
*** 5574,5582 ****
See convert_mbs_to_wcs. */
static int
! count_mbs_length(offset_buffer, length)
! int *offset_buffer;
! int length;
{
int upper, lower;
--- 5482,5488 ----
See convert_mbs_to_wcs. */
static int
! count_mbs_length(int *offset_buffer, int length)
{
int upper, lower;
*************** count_mbs_length(offset_buffer, length)
*** 5617,5649 ****
afterwards. */
#ifdef WCHAR
static int
! wcs_re_match_2_internal (bufp, cstring1, csize1, cstring2, csize2, pos,
! regs, stop, string1, size1, string2, size2,
! mbs_offset1, mbs_offset2)
! struct re_pattern_buffer *bufp;
! const char *cstring1, *cstring2;
! int csize1, csize2;
! int pos;
! struct re_registers *regs;
! int stop;
/* string1 == string2 == NULL means string1/2, size1/2 and
mbs_offset1/2 need seting up in this function. */
/* We need wchar_t* buffers correspond to cstring1, cstring2. */
! wchar_t *string1, *string2;
! /* We need the size of wchar_t buffers correspond to csize1, csize2. */
! int size1, size2;
/* offset buffer for optimizatoin. See convert_mbs_to_wc. */
! int *mbs_offset1, *mbs_offset2;
#else /* BYTE */
static int
! byte_re_match_2_internal (bufp, string1, size1,string2, size2, pos,
! regs, stop)
! struct re_pattern_buffer *bufp;
! const char *string1, *string2;
! int size1, size2;
! int pos;
! struct re_registers *regs;
! int stop;
#endif /* BYTE */
{
/* General temporaries. */
--- 5523,5548 ----
afterwards. */
#ifdef WCHAR
static int
! wcs_re_match_2_internal (struct re_pattern_buffer *bufp,
! const char *cstring1, int csize1,
! const char *cstring2, int csize2,
! int pos,
! struct re_registers *regs,
! int stop,
/* string1 == string2 == NULL means string1/2, size1/2 and
mbs_offset1/2 need seting up in this function. */
/* We need wchar_t* buffers correspond to cstring1, cstring2. */
! wchar_t *string1, int size1,
! wchar_t *string2, int size2,
/* offset buffer for optimizatoin. See convert_mbs_to_wc. */
! int *mbs_offset1, int *mbs_offset2)
#else /* BYTE */
static int
! byte_re_match_2_internal (struct re_pattern_buffer *bufp,
! const char *string1, int size1,
! const char *string2, int size2,
! int pos,
! struct re_registers *regs, int stop)
#endif /* BYTE */
{
/* General temporaries. */
*************** byte_re_match_2_internal (bufp, string1,
*** 7593,7601 ****
We don't handle duplicates properly (yet). */
static boolean
! PREFIX(group_match_null_string_p) (p, end, reg_info)
! UCHAR_T **p, *end;
! PREFIX(register_info_type) *reg_info;
{
int mcnt;
/* Point to after the args to the start_memory. */
--- 7492,7499 ----
We don't handle duplicates properly (yet). */
static boolean
! PREFIX(group_match_null_string_p) (UCHAR_T **p, UCHAR_T *end,
! PREFIX(register_info_type) *reg_info)
{
int mcnt;
/* Point to after the args to the start_memory. */
*************** PREFIX(group_match_null_string_p) (p, en
*** 7705,7713 ****
byte past the last. The alternative can contain groups. */
static boolean
! PREFIX(alt_match_null_string_p) (p, end, reg_info)
! UCHAR_T *p, *end;
! PREFIX(register_info_type) *reg_info;
{
int mcnt;
UCHAR_T *p1 = p;
--- 7603,7610 ----
byte past the last. The alternative can contain groups. */
static boolean
! PREFIX(alt_match_null_string_p) (UCHAR_T *p, UCHAR_T *end,
! PREFIX(register_info_type) *reg_info)
{
int mcnt;
UCHAR_T *p1 = p;
*************** PREFIX(alt_match_null_string_p) (p, end,
*** 7742,7750 ****
Sets P to one after the op and its arguments, if any. */
static boolean
! PREFIX(common_op_match_null_string_p) (p, end, reg_info)
! UCHAR_T **p, *end;
! PREFIX(register_info_type) *reg_info;
{
int mcnt;
boolean ret;
--- 7639,7646 ----
Sets P to one after the op and its arguments, if any. */
static boolean
! PREFIX(common_op_match_null_string_p) (UCHAR_T **p, UCHAR_T *end,
! PREFIX(register_info_type) *reg_info)
{
int mcnt;
boolean ret;
*************** PREFIX(common_op_match_null_string_p) (p
*** 7830,7839 ****
bytes; nonzero otherwise. */
static int
! PREFIX(bcmp_translate) (s1, s2, len, translate)
! const CHAR_T *s1, *s2;
! register int len;
! RE_TRANSLATE_TYPE translate;
{
register const UCHAR_T *p1 = (const UCHAR_T *) s1;
register const UCHAR_T *p2 = (const UCHAR_T *) s2;
--- 7726,7733 ----
bytes; nonzero otherwise. */
static int
! PREFIX(bcmp_translate) (const CHAR_T *s1, const CHAR_T *s2, register int len,
! RE_TRANSLATE_TYPE translate)
{
register const UCHAR_T *p1 = (const UCHAR_T *) s1;
register const UCHAR_T *p2 = (const UCHAR_T *) s2;
*************** PREFIX(bcmp_translate) (s1, s2, len, tra
*** 7866,7875 ****
We call regex_compile to do the actual compilation. */
const char *
! re_compile_pattern (pattern, length, bufp)
! const char *pattern;
! size_t length;
! struct re_pattern_buffer *bufp;
{
reg_errcode_t ret;
--- 7760,7767 ----
We call regex_compile to do the actual compilation. */
const char *
! re_compile_pattern (const char *pattern, size_t length,
! struct re_pattern_buffer *bufp)
{
reg_errcode_t ret;
*************** char *
*** 7915,7922 ****
regcomp/regexec below without link errors. */
weak_function
#endif
! re_comp (s)
! const char *s;
{
reg_errcode_t ret;
--- 7807,7813 ----
regcomp/regexec below without link errors. */
weak_function
#endif
! re_comp (const char *s)
{
reg_errcode_t ret;
*************** int
*** 7964,7971 ****
#ifdef _LIBC
weak_function
#endif
! re_exec (s)
! const char *s;
{
const int len = strlen (s);
return
--- 7855,7861 ----
#ifdef _LIBC
weak_function
#endif
! re_exec (const char *s)
{
const int len = strlen (s);
return
*************** re_exec (s)
*** 8014,8023 ****
the return codes and their meanings.) */
int
! regcomp (preg, pattern, cflags)
! regex_t *preg;
! const char *pattern;
! int cflags;
{
reg_errcode_t ret;
reg_syntax_t syntax
--- 7904,7910 ----
the return codes and their meanings.) */
int
! regcomp (regex_t *preg, const char *pattern, int cflags)
{
reg_errcode_t ret;
reg_syntax_t syntax
*************** weak_alias (__regcomp, regcomp)
*** 8110,8121 ****
We return 0 if we find a match and REG_NOMATCH if not. */
int
! regexec (preg, string, nmatch, pmatch, eflags)
! const regex_t *preg;
! const char *string;
! size_t nmatch;
! regmatch_t pmatch[];
! int eflags;
{
int ret;
struct re_registers regs;
--- 7997,8004 ----
We return 0 if we find a match and REG_NOMATCH if not. */
int
! regexec (const regex_t *preg, const char *string, size_t nmatch,
! regmatch_t pmatch[], int eflags)
{
int ret;
struct re_registers regs;
*************** weak_alias (__regexec, regexec)
*** 8177,8187 ****
from either regcomp or regexec. We don't use PREG here. */
size_t
! regerror (errcode, preg, errbuf, errbuf_size)
! int errcode;
! const regex_t *preg ATTRIBUTE_UNUSED;
! char *errbuf;
! size_t errbuf_size;
{
const char *msg;
size_t msg_size;
--- 8060,8067 ----
from either regcomp or regexec. We don't use PREG here. */
size_t
! regerror (int errcode, const regex_t *preg ATTRIBUTE_UNUSED,
! char *errbuf, size_t errbuf_size)
{
const char *msg;
size_t msg_size;
*************** weak_alias (__regerror, regerror)
*** 8224,8231 ****
/* Free dynamically allocated space used by PREG. */
void
! regfree (preg)
! regex_t *preg;
{
if (preg->buffer != NULL)
free (preg->buffer);
--- 8104,8110 ----
/* Free dynamically allocated space used by PREG. */
void
! regfree (regex_t *preg)
{
if (preg->buffer != NULL)
free (preg->buffer);