remove some duplicate #include's.

[deliverable/binutils-gdb.git] / gas / input-file.c

diff --git a/gas/input-file.c b/gas/input-file.c
index 01cc669feffb8522b6c01c2ae25cc565698c32c8..6ebd6b9139b504232ce0358b33ea69c2a33baf67 100644 (file)
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,5 +1,6 @@
 /* input_file.c - Deal with Input Files -
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
+   2002, 2003, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -16,17 +17,14 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Confines all details of reading source bytes to this module.
    All O/S specific crocks should live here.
    What we lose in "efficiency" we gain in modularity.
    Note we don't need to #include the "as.h" file. No common coupling!  */
 
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
@@ -79,12 +77,6 @@ input_file_buffer_size (void)
   return (BUFFER_SIZE);
 }
 
-int
-input_file_is_open (void)
-{
-  return f_in != (FILE *) 0;
-}
-
 /* Push the state of our input, returning a pointer to saved info that
    can be restored with input_file_pop ().  */
 
@@ -146,21 +138,22 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
       file_name = _("{standard input}");
     }
 
-  if (f_in)
-    c = getc (f_in);
+  if (f_in == NULL)
+    {
+      bfd_set_error (bfd_error_system_call);
+      as_perror (_("Can't open %s for reading"), file_name);
+      return;
+    }
+
+  c = getc (f_in);
 
-  if (f_in == NULL || ferror (f_in))
+  if (ferror (f_in))
     {
-#ifdef BFD_ASSEMBLER
       bfd_set_error (bfd_error_system_call);
-#endif
       as_perror (_("Can't open %s for reading"), file_name);
 
-      if (f_in)
-       {
-         fclose (f_in);
-         f_in = NULL;
-       }
+      fclose (f_in);
+      f_in = NULL;
       return;
     }
 
@@ -219,9 +212,7 @@ input_file_get (char *buf, int buflen)
   size = fread (buf, sizeof (char), buflen, f_in);
   if (size < 0)
     {
-#ifdef BFD_ASSEMBLER
       bfd_set_error (bfd_error_system_call);
-#endif
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
@@ -248,9 +239,7 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new
     size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
   if (size < 0)
     {
-#ifdef BFD_ASSEMBLER
       bfd_set_error (bfd_error_system_call);
-#endif
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
@@ -260,9 +249,7 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new
     {
       if (fclose (f_in))
        {
-#ifdef BFD_ASSEMBLER
          bfd_set_error (bfd_error_system_call);
-#endif
          as_perror (_("Can't close %s"), file_name);
        }
       f_in = (FILE *) 0;