diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /iconv/gconv_conf.c | |
parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'iconv/gconv_conf.c')
-rw-r--r-- | iconv/gconv_conf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index e23518846c..f173cde71b 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -1,5 +1,5 @@ /* Handle configuration data. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -99,7 +99,6 @@ const char *__gconv_path_envvar; /* Test whether there is already a matching module known. */ static int -internal_function detect_conflict (const char *alias) { struct gconv_module *node = __gconv_modules_db; @@ -183,7 +182,6 @@ add_alias (char *rp, void *modules) /* Insert a data structure for a new module in the search tree. */ static void -internal_function insert_module (struct gconv_module *newp, int tobefreed) { struct gconv_module **rootp = &__gconv_modules_db; @@ -242,7 +240,6 @@ insert_module (struct gconv_module *newp, int tobefreed) /* Add new module. */ static void -internal_function add_module (char *rp, const char *directory, size_t dir_len, void **modules, size_t *nmodules, int modcounter) { @@ -357,7 +354,6 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules, /* Read the next configuration file. */ static void -internal_function read_conf_file (const char *filename, const char *directory, size_t dir_len, void **modules, size_t *nmodules) { @@ -378,7 +374,7 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len, /* Process the known entries of the file. Comments start with `#' and end with the end of the line. Empty lines are ignored. */ - while (!feof_unlocked (fp)) + while (!__feof_unlocked (fp)) { char *rp, *endp, *word; ssize_t n = __getdelim (&line, &line_len, '\n', fp); @@ -425,7 +421,6 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len, /* Determine the directories we are looking for data in. */ void -internal_function __gconv_get_path (void) { struct path_elem *result; |