Remove syntactic sugar

[deliverable/binutils-gdb.git] / bfd / cache.c

diff --git a/bfd/cache.c b/bfd/cache.c
index 995cf1f9ebac02282ea87ef5c5d2ff1a76ea84c2..2f55717da686231dadeee4196b12643855aedf22 100644 (file)
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -241,7 +241,8 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
   if ((abfd->flags & BFD_IN_MEMORY) != 0)
     abort ();
 
-  while (abfd->my_archive)
+  while (abfd->my_archive != NULL
+        && !bfd_is_thin_archive (abfd->my_archive))
     abfd = abfd->my_archive;
 
   if (abfd->iostream != NULL)
@@ -267,8 +268,8 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
   else
     return (FILE *) abfd->iostream;
 
-  (*_bfd_error_handler) (_("reopening %B: %s\n"),
-                        orig_bfd, bfd_errmsg (bfd_get_error ()));
+  _bfd_error_handler (_("reopening %B: %s\n"),
+                     orig_bfd, bfd_errmsg (bfd_get_error ()));
   return NULL;
 }
 
@@ -466,7 +467,8 @@ cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
         pagesize_m1 = getpagesize () - 1;
 
       /* Handle archive members.  */
-      if (abfd->my_archive != NULL)
+      if (abfd->my_archive != NULL
+         && !bfd_is_thin_archive (abfd->my_archive))
         offset += abfd->origin;
 
       /* Align.  */