diff options
Diffstat (limited to 'locale/loadarchive.c')
-rw-r--r-- | locale/loadarchive.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/locale/loadarchive.c b/locale/loadarchive.c index 0ac11afa4a..516d30d8d1 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -1,5 +1,5 @@ /* Code to load locale data from the locale archive file. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -130,7 +130,6 @@ calculate_head_size (const struct locarhead *h) structure. If successful, sets *NAMEP to point directly into the mapped archive string table; that way, the next call can short-circuit strcmp. */ struct __locale_data * -internal_function _nl_load_locale_from_archive (int category, const char **namep) { const char *name = *namep; @@ -203,7 +202,7 @@ _nl_load_locale_from_archive (int category, const char **namep) archmapped = &headmap; /* The archive has never been opened. */ - fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; @@ -213,7 +212,7 @@ _nl_load_locale_from_archive (int category, const char **namep) /* stat failed, very strange. */ close_and_out: if (fd >= 0) - close_not_cancel_no_status (fd); + __close_nocancel_nostatus (fd); return NULL; } @@ -253,7 +252,7 @@ _nl_load_locale_from_archive (int category, const char **namep) { /* We've mapped the whole file already, so we can be sure we won't need this file descriptor later. */ - close_not_cancel_no_status (fd); + __close_nocancel_nostatus (fd); fd = -1; } @@ -398,8 +397,8 @@ _nl_load_locale_from_archive (int category, const char **namep) if (fd == -1) { struct stat64 st; - fd = open_not_cancel_2 (archfname, - O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = __open_nocancel (archfname, + O_RDONLY|O_LARGEFILE|O_CLOEXEC); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; @@ -452,7 +451,7 @@ _nl_load_locale_from_archive (int category, const char **namep) /* We don't need the file descriptor any longer. */ if (fd >= 0) - close_not_cancel_no_status (fd); + __close_nocancel_nostatus (fd); fd = -1; /* We succeeded in mapping all the necessary regions of the archive. @@ -462,7 +461,7 @@ _nl_load_locale_from_archive (int category, const char **namep) if (__glibc_unlikely (lia == NULL)) return NULL; - lia->name = strdup (*namep); + lia->name = __strdup (*namep); if (__glibc_unlikely (lia->name == NULL)) { free (lia); |