]> git.ipfire.org Git - thirdparty/glibc.git/commit - locale/loadarchive.c
Consolidate non cancellable open call
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 3 Jul 2017 14:11:24 +0000 (11:11 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Thu, 17 Aug 2017 19:50:35 +0000 (16:50 -0300)
commitc22845744cd931267e0d7cb2e2b35a0da9c9510a
tree2cd9c6059492a3bf24c28edc159d0cee1ae6943e
parentd4505b895f2aa577a6b974ab4bd0a1fd0db60ceb
Consolidate non cancellable open call

This patch consolidates all the non cancellable open calls to use
the __open_nocancel identifier.  For non cancellable targets it will
be just a macro to call the default respective symbol while on Linux
will be a internal one.

To be consistent with the following non cancellable openat call, a
new __open64_nocancel is also added (although not currently used).

Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.

* sysdeps/generic/not-cancel.h (open_not_cancel): Remove macro.
(open_not_cancel_2): Likewise.
(open_nocancel): New macro.
(open64_nocancel): Likewise.
* sysdeps/unix/sysv/linux/not-cancel.h (open_not_cancel): Remove macro.
(open_not_cancel_2): Likewise.
(__open_nocancel): New prototype.
(__open64_nocancel): Likewise.
* sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add
__open_nocancel.
* sysdeps/unix/sysv/linux/open.c (__open_nocancel): New function.
* sysdeps/unix/sysv/linux/open64.c (__open64_nocancel): Likewise.
* catgets/open_catalog.c (__open_catalog): Replace open_not_cancel{_2}
with __open_nocancel.
* csu/check_fds.c (check_one_fd): Likewise.
* gmon/gmon.c (write_gmon): Likewise.
* iconv/gconv_cache.c (__gconv_load_cached): Likewise.
* intl/loadmsgcat.c (open): Likewise.
* libio/fileops.c (_IO_file_open): Likewise.
* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
* locale/loadlocale.c (_nl_load_locale): Likewise.
* login/utmp_file.c (setutent_file): Likewise.
* misc/daemon.c (daemon): Likewise.
* nss/nss_db/db-open.c (internal_setent): Likewise.
* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
* sysdeps/posix/libc_fatal.c (__libc_message): Likewise.
* sysdeps/posix/opendir.c (tryopen_o_directory): Likewise.
(__opendir): Likewise.
* sysdeps/posix/spawni.c (__spawni_child): Likewise.
* sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise.
* sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise.
(gethostid): Likewise.
* sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise.
* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise.
* sysdeps/unix/sysv/linux/grantpt.c (__close_all_fds): Likewise.
* sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise.
* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock):
Likewise.
* sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps):
Likewise.
* sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c (__get_clockfreq):
Likewise.
* sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np):
Likewise.
* sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np):
Likewise.
* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
36 files changed:
ChangeLog
catgets/open_catalog.c
csu/check_fds.c
gmon/gmon.c
iconv/gconv_cache.c
intl/loadmsgcat.c
libio/fileops.c
locale/loadarchive.c
locale/loadlocale.c
login/utmp_file.c
misc/daemon.c
nss/nss_db/db-open.c
sysdeps/generic/not-cancel.h
sysdeps/mach/hurd/opendir.c
sysdeps/posix/libc_fatal.c
sysdeps/posix/opendir.c
sysdeps/posix/spawni.c
sysdeps/unix/sysv/linux/Versions
sysdeps/unix/sysv/linux/fips-private.h
sysdeps/unix/sysv/linux/gethostid.c
sysdeps/unix/sysv/linux/getloadavg.c
sysdeps/unix/sysv/linux/getlogin_r.c
sysdeps/unix/sysv/linux/getsysstats.c
sysdeps/unix/sysv/linux/grantpt.c
sysdeps/unix/sysv/linux/i386/smp.h
sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
sysdeps/unix/sysv/linux/libc_fatal.c
sysdeps/unix/sysv/linux/malloc-sysdep.h
sysdeps/unix/sysv/linux/not-cancel.h
sysdeps/unix/sysv/linux/open.c
sysdeps/unix/sysv/linux/open64.c
sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
sysdeps/unix/sysv/linux/pthread_getname.c
sysdeps/unix/sysv/linux/pthread_setname.c
sysdeps/unix/sysv/linux/spawni.c
sysdeps/unix/sysv/linux/sysconf.c