Remove trailing redundant `;'

[deliverable/binutils-gdb.git] / binutils / arsup.c

diff --git a/binutils/arsup.c b/binutils/arsup.c
index f94ebb9b852667f392822eb21cb24aeafdd5052b..9ddc55d64a32d86f62da046dbae61a7ab248549a 100644 (file)
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -1,12 +1,12 @@
 /* arsup.c - Archive support for MRI compatibility
    Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
 /* arsup.c - Archive support for MRI compatibility
    Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,

-   2004 Free Software Foundation, Inc.
+   2004, 2005, 2007, 2008 Free Software Foundation, Inc.

 
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 
 /* Contributed by Steve Chamberlain
 
 
 /* Contributed by Steve Chamberlain


@@ -25,11 +26,12 @@
    This file looks after requests from arparse.y, to provide the MRI
    style librarian command syntax + 1 word LIST.  */
 
    This file looks after requests from arparse.y, to provide the MRI
    style librarian command syntax + 1 word LIST.  */
 

+#include "sysdep.h"

 #include "bfd.h"
 #include "bfd.h"

-#include "arsup.h"

 #include "libiberty.h"
 #include "libiberty.h"

-#include "bucomm.h"

 #include "filenames.h"
 #include "filenames.h"

+#include "bucomm.h"
+#include "arsup.h"

 
 static void map_over_list
   (bfd *, void (*function) (bfd *, bfd *), struct list *);
 
 static void map_over_list
   (bfd *, void (*function) (bfd *, bfd *), struct list *);


@@ -51,10 +53,10 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
     {
       bfd *next;
 
     {
       bfd *next;
 

-      head = arch->next;
+      head = arch->archive_next;

       while (head != NULL)
        {
       while (head != NULL)
        {

-         next = head->next;
+         next = head->archive_next;

          function (head, (bfd *) NULL);
          head = next;
        }
          function (head, (bfd *) NULL);
          head = next;
        }


@@ -73,7 +75,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
          bfd_boolean found = FALSE;
          bfd *prev = arch;
 
          bfd_boolean found = FALSE;
          bfd *prev = arch;
 

-         for (head = arch->next; head; head = head->next)
+         for (head = arch->archive_next; head; head = head->archive_next)

            {
              if (head->filename != NULL
                  && FILENAME_CMP (ptr->name, head->filename) == 0)
            {
              if (head->filename != NULL
                  && FILENAME_CMP (ptr->name, head->filename) == 0)


@@ -197,7 +199,7 @@ ar_open (char *name, int t)
          while (element)
            {
              *ptr = element;
          while (element)
            {
              *ptr = element;

-             ptr = &element->next;
+             ptr = &element->archive_next;

              element = bfd_openr_next_archived_file (ibfd, element);
            }
        }
              element = bfd_openr_next_archived_file (ibfd, element);
            }
        }


@@ -205,6 +207,7 @@ ar_open (char *name, int t)
       bfd_set_format (obfd, bfd_archive);
 
       obfd->has_armap = 1;
       bfd_set_format (obfd, bfd_archive);
 
       obfd->has_armap = 1;

+      obfd->is_thin_archive = 0;

     }
 }
 
     }
 }
 


@@ -213,9 +216,9 @@ ar_addlib_doer (bfd *abfd, bfd *prev)
 {
   /* Add this module to the output bfd.  */
   if (prev != NULL)
 {
   /* Add this module to the output bfd.  */
   if (prev != NULL)

-    prev->next = abfd->next;
+    prev->archive_next = abfd->archive_next;

 
 

-  abfd->next = obfd->archive_head;
+  abfd->archive_next = obfd->archive_head;

   obfd->archive_head = abfd;
 }
 
   obfd->archive_head = abfd;
 }
 


@@ -261,7 +264,7 @@ ar_addmod (struct list *list)
            }
          else
            {
            }
          else
            {

-             abfd->next = obfd->archive_head;
+             abfd->archive_next = obfd->archive_head;

              obfd->archive_head = abfd;
            }
          list = list->next;
              obfd->archive_head = abfd;
            }
          list = list->next;


@@ -298,13 +301,13 @@ ar_delete (struct list *list)
            {
              if (FILENAME_CMP(member->filename, list->name) == 0)
                {
            {
              if (FILENAME_CMP(member->filename, list->name) == 0)
                {

-                 *prev = member->next;
+                 *prev = member->archive_next;

                  found = 1;
                }
              else
                  found = 1;
                }
              else

-               prev = &(member->next);
+               prev = &(member->archive_next);

 
 

-             member = member->next;
+             member = member->archive_next;

            }
 
          if (!found)
            }
 
          if (!found)


@@ -372,15 +375,15 @@ ar_replace (struct list *list)
                  else
                    {
                      *prev = abfd;
                  else
                    {
                      *prev = abfd;

-                     abfd->next = member->next;
+                     abfd->archive_next = member->archive_next;

                      found = 1;
                    }
                }
              else
                {
                      found = 1;
                    }
                }
              else
                {

-                 prev = &(member->next);
+                 prev = &(member->archive_next);

                }
                }

-             member = member->next;
+             member = member->archive_next;

            }
 
          if (!found)
            }
 
          if (!found)


@@ -423,7 +426,7 @@ ar_list (void)
 
       for (abfd = obfd->archive_head;
           abfd != (bfd *)NULL;
 
       for (abfd = obfd->archive_head;
           abfd != (bfd *)NULL;

-          abfd = abfd->next)
+          abfd = abfd->archive_next)

        ar_directory_doer (abfd, (bfd *) NULL);
     }
 }
        ar_directory_doer (abfd, (bfd *) NULL);
     }
 }


@@ -462,7 +465,7 @@ ar_extract (struct list *list)
                  found = 1;
                }
 
                  found = 1;
                }
 

-             member = member->next;
+             member = member->archive_next;

            }
 
          if (!found)
            }
 
          if (!found)