diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-03 14:20:46 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-18 10:31:16 -0300 |
| commit | a748eb31c137e9b69c3d81765271a544f93f8fe5 (patch) | |
| tree | f69460770ec9e825ff9f8cdbd4d117808750e8fb /libio/fileops.c | |
| parent | 098b9dd46814f7e624e42a8844c169f3edc67052 (diff) | |
| download | glibc-a748eb31c137e9b69c3d81765271a544f93f8fe5.tar.gz glibc-a748eb31c137e9b69c3d81765271a544f93f8fe5.tar.xz glibc-a748eb31c137e9b69c3d81765271a544f93f8fe5.zip | |
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.
Diffstat (limited to 'libio/fileops.c')
| -rw-r--r-- | libio/fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index 67f3d72020..80bd3f5b95 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1204,7 +1204,7 @@ _IO_ssize_t _IO_file_read (_IO_FILE *fp, void *buf, _IO_ssize_t size) { return (__builtin_expect (fp->_flags2 & _IO_FLAGS2_NOTCANCEL, 0) - ? read_not_cancel (fp->_fileno, buf, size) + ? __read_nocancel (fp->_fileno, buf, size) : read (fp->_fileno, buf, size)); } libc_hidden_def (_IO_file_read) |