[Bug libc/17583] New: tzfile.c namespace

[Bug libc/17583] New: tzfile.c namespace

[jsm28 at gcc dot gnu.org]

https://sourceware.org/bugzilla/show_bug.cgi?id=17583

            Bug ID: 17583
           Summary: tzfile.c namespace
           Product: glibc
           Version: 2.21
            Status: NEW
          Severity: normal
          Priority: P2
         Component: libc
          Assignee: unassigned at sourceware dot org
          Reporter: jsm28 at gcc dot gnu.org
                CC: drepper.fsp at gmail dot com

tzfile.c is brought in by various ISO C functions, but calls fileno,
fread_unlocked and ftello, which are not ISO C functions.

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug libc/17583] tzfile.c namespace

[cvs-commit at gcc dot gnu.org]

https://sourceware.org/bugzilla/show_bug.cgi?id=17583

--- Comment #1 from cvs-commit at gcc dot gnu.org <cvs-commit at gcc dot gnu.org> ---
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  5a6fa4d7ed465c2f7da9d73004c972519dc2100e (commit)
      from  2581b98ecb1f2b3669a4b88a605f763fa4e85ee6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5a6fa4d7ed465c2f7da9d73004c972519dc2100e

commit 5a6fa4d7ed465c2f7da9d73004c972519dc2100e
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Nov 12 16:22:51 2014 +0000

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   27 +++++++++++++++++++++++++++
 NEWS              |    2 +-
 include/stdio.h   |    8 ++++++--
 libio/fileno.c    |    8 +++++---
 libio/ftello.c    |    7 ++++---
 libio/iofread.c   |    3 ++-
 libio/iofread_u.c |    5 +++--
 time/tzfile.c     |   39 +++++++++++++++++++++------------------
 8 files changed, 69 insertions(+), 30 deletions(-)

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Bug libc/17583] tzfile.c namespace

[jsm28 at gcc dot gnu.org]

https://sourceware.org/bugzilla/show_bug.cgi?id=17583

Joseph Myers <jsm28 at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #2 from Joseph Myers <jsm28 at gcc dot gnu.org> ---
Fixed for 2.21.

-- 
You are receiving this mail because:
You are on the CC list for the bug.