diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/glob.h | 1 | ||||
| -rw-r--r-- | posix/regex.c | 2 | ||||
| -rw-r--r-- | posix/regex.h | 30 | ||||
| -rw-r--r-- | posix/unistd.h | 1 |
4 files changed, 1 insertions, 33 deletions
diff --git a/posix/glob.h b/posix/glob.h index bf0759c077..6a3ab1817f 100644 --- a/posix/glob.h +++ b/posix/glob.h @@ -183,7 +183,6 @@ extern void globfree64 __P ((glob64_t *__pglob)); This function is not part of the interface specified by POSIX.2 but several programs want to use it. */ -extern int __glob_pattern_p __P ((__const char *__pattern, int __quote)); extern int glob_pattern_p __P ((__const char *__pattern, int __quote)); #endif diff --git a/posix/regex.c b/posix/regex.c index ba01f73508..f05abc805d 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -207,7 +207,7 @@ init_syntax_once () #endif /* not emacs */ /* Get the interface, including the syntax bits. */ -#include "regex.h" +#include <regex.h> /* isalpha etc. are used for the character classes. */ #include <ctype.h> diff --git a/posix/regex.h b/posix/regex.h index 2bca5378a4..3fa93e5033 100644 --- a/posix/regex.h +++ b/posix/regex.h @@ -441,15 +441,11 @@ typedef struct /* 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 _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)); extern const char *re_compile_pattern _RE_ARGS ((const char *pattern, size_t length, struct re_pattern_buffer *buffer)); @@ -458,7 +454,6 @@ extern const char *re_compile_pattern /* 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 _RE_ARGS ((struct re_pattern_buffer *buffer)); @@ -467,9 +462,6 @@ 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, - int length, int start, int range, struct re_registers *regs)); extern int re_search _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, int length, int start, int range, struct re_registers *regs)); @@ -477,10 +469,6 @@ extern int re_search /* 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)); extern int re_search_2 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, int length1, const char *string2, int length2, @@ -489,19 +477,12 @@ extern int re_search_2 /* 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 _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)); extern int re_match_2 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, int length1, const char *string2, int length2, @@ -520,9 +501,6 @@ extern int re_match_2 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)); 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)); @@ -536,24 +514,16 @@ extern int re_exec _RE_ARGS ((const char *)); #endif /* POSIX compatibility. */ -extern int __regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern, - int __cflags)); extern int regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern, int __cflags)); -extern int __regexec _RE_ARGS ((const regex_t *__preg, - const char *__string, size_t __nmatch, - regmatch_t __pmatch[], int __eflags)); extern int regexec _RE_ARGS ((const regex_t *__preg, const char *__string, size_t __nmatch, regmatch_t __pmatch[], int __eflags)); -extern size_t __regerror _RE_ARGS ((int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size)); 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)); extern void regfree _RE_ARGS ((regex_t *__preg)); diff --git a/posix/unistd.h b/posix/unistd.h index 3ea24818d3..9e8cf6ba02 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -402,7 +402,6 @@ extern int lchown __P ((__const char *__file, __uid_t __owner, #endif /* Use BSD || X/Open Unix. */ /* Change the process's working directory to PATH. */ -extern int __chdir __P ((__const char *__path)); extern int chdir __P ((__const char *__path)); #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED |