2007-12-17 H.J. Lu <hongjiu.lu@intel.com>

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index 61ef6f55e40f94acc29a8d38abcf6aa6cba8ade0..1eca6475830907331cb180fa0edeb59875dc9ba5 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,13 +1,13 @@
 /* listing.c - maintain assembly listings
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005
+   2001, 2002, 2003, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful,
@@ -946,15 +946,6 @@ listing_listing (char *name ATTRIBUTE_UNUSED)
   buffer = xmalloc (listing_rhs_width);
   data_buffer = xmalloc (MAX_BYTES);
   eject = 1;
-  list = head;
-
-  while (list != (list_info_type *) NULL && 0)
-    {
-      if (list->next)
-       list->frag = list->next->frag;
-      list = list->next;
-    }
-
   list = head->next;
 
   while (list)
@@ -1085,8 +1076,7 @@ listing_print (char *name)
        using_stdout = 0;
       else
        {
-         bfd_set_error (bfd_error_system_call);
-         as_perror (_("can't open list file: %s"), name);
+         as_warn (_("can't open %s: %s"), name, xstrerror (errno));
          list_file = stdout;
          using_stdout = 1;
        }
@@ -1104,10 +1094,7 @@ listing_print (char *name)
   if (! using_stdout)
     {
       if (fclose (list_file) == EOF)
-       {
-         bfd_set_error (bfd_error_system_call);
-         as_perror (_("error closing list file: %s"), name);
-       }
+       as_warn (_("can't close %s: %s"), name, xstrerror (errno));
     }
 
   if (last_open_file)