diff options
author | Pedro Alves <palves@redhat.com> | 2017-02-17 01:26:12 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-02-17 01:26:12 +0000 |
commit | c7c3d11bead272b718bade379e3441ff239bbd16 (patch) | |
tree | a6b92625643c23692755fe0625947b56e5fe82fe /bfd/cache.c | |
parent | 4265548c65907f095e887148f61af4813b106737 (diff) | |
download | fsf-binutils-gdb-c7c3d11bead272b718bade379e3441ff239bbd16.zip fsf-binutils-gdb-c7c3d11bead272b718bade379e3441ff239bbd16.tar.gz fsf-binutils-gdb-c7c3d11bead272b718bade379e3441ff239bbd16.tar.bz2 |
bfd: Rename real_{ftell, fseek, fopen}
Give these bfd-internal symbols with external linkage a _bfd_ prefix
to avoid collisions in the global symbol namespace.
bfd/ChangeLog:
2017-02-17 Pedro Alves <palves@redhat.com>
* bfdio.c (real_ftell): Rename to ...
(_bfd_real_ftell): ... this.
(real_fseek): Rename to ...
(_bfd_real_fseek): ... this.
(real_fopen): Rename to ...
(_bfd_real_fopen): ... this.
* libbfd-in.h (real_ftell): Rename to ...
(_bfd_real_ftell): ... this.
(real_fseek): Rename to ...
(_bfd_real_fseek): ... this.
(real_fopen): Rename to ...
(_bfd_real_fopen): ... this.
* cache.c, dwarf2.c, opncls.c: Adjust all callers.
* libbfd.h: Regenerate.
Diffstat (limited to 'bfd/cache.c')
-rw-r--r-- | bfd/cache.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bfd/cache.c b/bfd/cache.c index 0f8a9d1..17bca8b 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -212,7 +212,7 @@ close_one (void) return TRUE; } - to_kill->where = real_ftell ((FILE *) to_kill->iostream); + to_kill->where = _bfd_real_ftell ((FILE *) to_kill->iostream); return bfd_cache_delete (to_kill); } @@ -262,7 +262,8 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag) if (bfd_open_file (abfd) == NULL) ; else if (!(flag & CACHE_NO_SEEK) - && real_fseek ((FILE *) abfd->iostream, abfd->where, SEEK_SET) != 0 + && _bfd_real_fseek ((FILE *) abfd->iostream, + abfd->where, SEEK_SET) != 0 && !(flag & CACHE_NO_SEEK_ERROR)) bfd_set_error (bfd_error_system_call); else @@ -280,7 +281,7 @@ cache_btell (struct bfd *abfd) FILE *f = bfd_cache_lookup (abfd, CACHE_NO_OPEN); if (f == NULL) return abfd->where; - return real_ftell (f); + return _bfd_real_ftell (f); } static int @@ -289,7 +290,7 @@ cache_bseek (struct bfd *abfd, file_ptr offset, int whence) FILE *f = bfd_cache_lookup (abfd, whence != SEEK_CUR ? CACHE_NO_SEEK : CACHE_NORMAL); if (f == NULL) return -1; - return real_fseek (f, offset, whence); + return _bfd_real_fseek (f, offset, whence); } /* Note that archive entries don't have streams; they share their parent's. @@ -609,15 +610,15 @@ bfd_open_file (bfd *abfd) { case read_direction: case no_direction: - abfd->iostream = real_fopen (abfd->filename, FOPEN_RB); + abfd->iostream = _bfd_real_fopen (abfd->filename, FOPEN_RB); break; case both_direction: case write_direction: if (abfd->opened_once) { - abfd->iostream = real_fopen (abfd->filename, FOPEN_RUB); + abfd->iostream = _bfd_real_fopen (abfd->filename, FOPEN_RUB); if (abfd->iostream == NULL) - abfd->iostream = real_fopen (abfd->filename, FOPEN_WUB); + abfd->iostream = _bfd_real_fopen (abfd->filename, FOPEN_WUB); } else { @@ -647,7 +648,7 @@ bfd_open_file (bfd *abfd) if (stat (abfd->filename, &s) == 0 && s.st_size != 0) unlink_if_ordinary (abfd->filename); #endif - abfd->iostream = real_fopen (abfd->filename, FOPEN_WUB); + abfd->iostream = _bfd_real_fopen (abfd->filename, FOPEN_WUB); abfd->opened_once = TRUE; } break; |