aboutsummaryrefslogtreecommitdiffstats
path: root/libio/ftello.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-12 16:22:51 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-12 16:22:51 +0000
commit5a6fa4d7ed465c2f7da9d73004c972519dc2100e (patch)
treecefc8c3b17e8e57731afe93278c12a0d5137bae0 /libio/ftello.c
parent2581b98ecb1f2b3669a4b88a605f763fa4e85ee6 (diff)
downloadtermbaud-5a6fa4d7ed465c2f7da9d73004c972519dc2100e.tar.gz
termbaud-5a6fa4d7ed465c2f7da9d73004c972519dc2100e.tar.xz
termbaud-5a6fa4d7ed465c2f7da9d73004c972519dc2100e.zip
Fix tzfile.c namespace (bug 17583).
tzfile.c is brought in by various ISO C functions, but calls fileno, fread_unlocked and ftello, which are not ISO C functions. This patch adds names __fileno, __fread_unlocked and __ftello for those functions, making tzfile.c use those new names. Note: there are various uses of fileno elsewhere in glibc that I didn't change, although it may turn out that some of those also need to use __fileno. Tested for x86_64 with the glibc testsuite. Changed line numbers in tzfile.c cause changes in assertions, and for some reason this ends up with different instruction choice and register allocation, affecting the size of __tzfile_read and so making comparison of disassembly for libc.so problematic. [BZ #17583] * libio/fileno.c (fileno): Rename to __fileno and define as weak alias of __fileno. Use libc_hidden_weak. (__fileno): Use libc_hidden_def. [weak_alias] (fileno_unlocked): Define as weak alias of __fileno. * libio/ftello.c (ftello): Rename to __ftello and define as weak alias of __ftello. [__OFF_T_MATCHES_OFF64_T] (ftello64): Define as weak alias of __ftello. * libio/iofread.c [weak_alias && !_IO_MTSAFE_IO] (__fread_unlocked): Define as strong alias of _IO_fread. Use libc_hidden_def. (fread_unlocked): Don't use libc_hidden_ver. * libio/iofread_u.c (fread_unlocked): Rename to __fread_unlocked and define as weak alias of __fread_unlocked. Don't use libc_hidden_def. (__fread_unlocked): Use libc_hidden_def. * include/stdio.h (__fileno): Declare. Use libc_hidden_proto. (ftello): Don't use libc_hidden_proto. (__ftello): Declare. Use libc_hidden_proto. (fread_unlocked): Don't use libc_hidden_proto. (__fread_unlocked): Declare. Use libc_hidden_proto. * time/tzfile.c (__tzfile_read): Use __fileno, __fread_unlocked and __ftello instead of fileno, fread_unlocked and ftello.
Diffstat (limited to 'libio/ftello.c')
-rw-r--r--libio/ftello.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libio/ftello.c b/libio/ftello.c
index 208ff8cfcec..33a2160c187 100644
--- a/libio/ftello.c
+++ b/libio/ftello.c
@@ -31,7 +31,7 @@
off_t
-ftello (fp)
+__ftello (fp)
_IO_FILE *fp;
{
_IO_off64_t pos;
@@ -61,8 +61,9 @@ ftello (fp)
}
return pos;
}
-libc_hidden_def (ftello)
+libc_hidden_def (__ftello)
+weak_alias (__ftello, ftello)
#ifdef __OFF_T_MATCHES_OFF64_T
-weak_alias (ftello, ftello64)
+weak_alias (__ftello, ftello64)
#endif