diff options
Diffstat (limited to 'include/regex.h')
| -rw-r--r-- | include/regex.h | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/include/regex.h b/include/regex.h index e8b7eb9f1..5bd3088e5 100644 --- a/include/regex.h +++ b/include/regex.h @@ -448,37 +448,22 @@ typedef struct /* Declarations for routines. */ -/* To avoid duplicating every routine declaration -- once with a - prototype (if we are ANSI), and once without (if we aren't) -- we - use the following macro to declare argument types. This - 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)); +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 _RE_ARGS ((const char *__pattern, size_t __length, - struct re_pattern_buffer *__buffer)); +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 _RE_ARGS ((struct re_pattern_buffer *__buffer)); +extern int re_compile_fastmap (struct re_pattern_buffer *__buffer); /* Search in the string STRING (with length LENGTH) for the pattern @@ -486,30 +471,30 @@ extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *__buffer)); 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, +extern int re_search (struct re_pattern_buffer *__buffer, const char *__string, int __length, int __start, int __range, - struct re_registers *__regs)); + 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, +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)); + 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)); +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 _RE_ARGS ((struct re_pattern_buffer *__buffer, +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)); + struct re_registers *__regs, int __stop); /* Set REGS to hold NUM_REGS registers, storing them in STARTS and @@ -524,16 +509,16 @@ extern int re_match_2 _RE_ARGS ((struct re_pattern_buffer *__buffer, 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, +extern void re_set_registers (struct re_pattern_buffer *__buffer, struct re_registers *__regs, unsigned int __num_regs, - regoff_t *__starts, regoff_t *__ends)); + 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 *)); +extern char *re_comp (const char *); +extern int re_exec (const char *); # endif #endif @@ -558,19 +543,19 @@ extern int re_exec _RE_ARGS ((const char *)); #endif /* POSIX compatibility. */ -extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, +extern int regcomp (regex_t *__restrict __preg, const char *__restrict __pattern, - int __cflags)); + int __cflags); -extern int regexec _RE_ARGS ((const regex_t *__restrict __preg, +extern int regexec (const regex_t *__restrict __preg, const char *__restrict __string, size_t __nmatch, regmatch_t __pmatch[__restrict_arr], - int __eflags)); + int __eflags); -extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__restrict __preg, - char *__restrict __errbuf, size_t __errbuf_size)); +extern size_t regerror (int __errcode, const regex_t *__restrict __preg, + char *__restrict __errbuf, size_t __errbuf_size); -extern void regfree _RE_ARGS ((regex_t *__preg)); +extern void regfree (regex_t *__preg); #ifdef __cplusplus |