diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_conf.c | 2 | ||||
| -rw-r--r-- | iconv/gconv_db.c | 10 | ||||
| -rw-r--r-- | iconv/gconv_simple.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 252096b9f9..c67a0d8f8c 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -404,7 +404,7 @@ __gconv_read_conf (void) #endif char real_elem[MAXPATHLEN]; - if (realpath (elem, real_elem) != NULL) + if (__realpath (elem, real_elem) != NULL) { size_t elem_len = strlen (real_elem); char *filename, *tmp; 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. */ diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 6fe98a9065..aea0e8f021 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -586,7 +586,7 @@ __gconv_transform_utf8_ucs4 (struct gconv_step *step, break; } - if (*inlen == 0 && !mbsinit (data->statep)) + if (*inlen == 0 && !__mbsinit (data->statep)) { /* We have an incomplete character at the end. */ result = GCONV_INCOMPLETE_INPUT; @@ -705,7 +705,7 @@ __gconv_transform_ucs2_ucs4 (struct gconv_step *step, break; } - if (*inlen == 0 && !mbsinit (data->statep)) + if (*inlen == 0 && !__mbsinit (data->statep)) { /* We have an incomplete character at the end. */ result = GCONV_INCOMPLETE_INPUT; @@ -837,7 +837,7 @@ __gconv_transform_ucs4_ucs2 (struct gconv_step *step, break; } - if (*inlen == 0 && !mbsinit (data->statep)) + if (*inlen == 0 && !__mbsinit (data->statep)) { /* We have an incomplete character at the end. */ result = GCONV_INCOMPLETE_INPUT; |