diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-08 20:27:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-08 20:27:31 +0000 |
| commit | 2ad4fab214b13af85237b9e836c525e9ce3e7fb6 (patch) | |
| tree | 62a1af6c73f43be6aba28da5d8fdc33122b476aa /iconv/gconv_db.c | |
| parent | cd2bd5915d633f9d526d8d17636054c93cd1580e (diff) | |
| download | glibc-2ad4fab214b13af85237b9e836c525e9ce3e7fb6.tar.gz | |
Update.
1998-04-08 20:06 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath.
* iconv/gconv_db.c: Use __ protected regex functions.
* iconv/gconv_simple.c: Use __mbsinit not mbsinit.
* posix/getopt_init.c: Use __getpid not getpid.
* posix/regex.c: Rename all global functions to start with __ and
make old names weak aliases.
* posix/regex.h: Adopt prototypes for this.
* stdlib/canonicalize.c: Define __realpath, make canonicalize_file_name
a weak alias and use __getcwd instead of getcwd.
* stdlib/stdlib.h: Declare __realpath and __canonicalize_file_name.
* stdlib/strtod.c: Use __btowc instead of btowc.
* stdlib/strtol.c: Likewise.
* sysdeps/libm-ieee754/s_matherr.c: Weaken definition of matherr.
* sysdeps/unix/sysv/linux/errlist.c: Make sure definitions of sys_nerr
and sys_errlist are weak.
* wcsmbs/btowc.c: Define function as __btowc and make btowc weak alias.
* wcsmbs/mbrtowc.c: Use __mbsinit not mbsinit.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/mbsinit.c: Define function as __mbsinit and make mbsinit
weak alias.
* wcsmbs/wchar.h: Declare __btowc and __mbsinit.
* wctype/wctype.c: Define function as __wctype and make wctype
weak alias.
* wctype/wctype.h: Declare __wctype.
Diffstat (limited to 'iconv/gconv_db.c')
| -rw-r--r-- | iconv/gconv_db.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index b3bdd7abc0..9f4366b7df 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -329,8 +329,8 @@ find_derivation (const char *toset, const char *toset_expand, { regex_t *newp = (regex_t *) malloc (sizeof (regex_t)); - if (regcomp (newp, __gconv_modules_db[cnt]->from_pattern, - REG_EXTENDED | REG_ICASE) != 0) + if (__regcomp (newp, __gconv_modules_db[cnt]->from_pattern, + REG_EXTENDED | REG_ICASE) != 0) { /* Something is wrong. Remember this. */ free (newp); @@ -345,8 +345,8 @@ find_derivation (const char *toset, const char *toset_expand, /* Try to match the from name. */ regmatch_t match[4]; - if (regexec (__gconv_modules_db[cnt]->from_regex, - current->result_set, 4, match, 0) == 0 + if (__regexec (__gconv_modules_db[cnt]->from_regex, + current->result_set, 4, match, 0) == 0 && match[0].rm_so == 0 && current->result_set[match[0].rm_eo] == '\0') { @@ -600,7 +600,7 @@ free_mem (void) for (cnt = 0; cnt < __gconv_nmodules; ++cnt) { if (__gconv_modules_db[cnt]->from_regex != NULL) - regfree ((regex_t *) __gconv_modules_db[cnt]->from_regex); + __regfree ((regex_t *) __gconv_modules_db[cnt]->from_regex); /* Modules which names do not start with a slash are builtin transformations and the memory is not allocated dynamically. */ |