Consolidate non cancellable read call
commita748eb31c137e9b69c3d81765271a544f93f8fe5
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 3 Jul 2017 17:20:46 +0000 (3 14:20 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 18 Aug 2017 13:31:16 +0000 (18 10:31 -0300)
treef69460770ec9e825ff9f8cdbd4d117808750e8fb
parent098b9dd46814f7e624e42a8844c169f3edc67052
Consolidate non cancellable read call

This patch consolidates all the non cancellable read calls to use
the __read_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.

Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE
namespace.

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

* sysdeps/generic/not-cancel.h (read_not_cancel): Remove macro.
(__read_nocancel): New macro.
* sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add
__read_nocancel.
* sysdeps/unix/sysv/linux/not-cancel.h (__read_nocancel): Remove
macro.
(__read_nocancel): New prototype.
* sysdeps/unix/sysv/linux/read.c (__read_nocancel): New function.
* catgets/open_catalog.c (__open_catalog): Replace read_not_cancel
with __read_nocancel.
* intl/loadmsgcat.c (read): Likewise.
* libio/fileops.c (_IO_file_read): Likewise.
* locale/loadlocale.c (_nl_load_locale): Likewise.
* login/utmp_file.c (getutent_r_file): Likewise.
(internal_getut_r): Likewise.
(getutline_r_file): Likewise.
* sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise.
* sysdeps/unix/sysv/linux/gethostid.c (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 (next_line): 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/pthread_getname.c (pthread_getname_np):
Likewise.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
21 files changed:
ChangeLog
catgets/open_catalog.c
intl/loadmsgcat.c
libio/fileops.c
locale/loadlocale.c
login/utmp_file.c
sysdeps/generic/not-cancel.h
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/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/pthread_getname.c
sysdeps/unix/sysv/linux/read.c
sysdeps/unix/sysv/linux/sysconf.c