darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* input-file.c (input_file_open): Rearrange to avoid warning.

Browse source
This commit is contained in:
Alan Modra 2005-02-21 03:03:02 +00:00
parent 665435215e
commit ac4528d236
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gas/ChangeLog
View file

@ -1,3 +1,7 @@
2005-02-21 Alan Modra <amodra@bigpond.net.au>
* input-file.c (input_file_open): Rearrange to avoid warning.
2005-02-19 Alan Modra <amodra@bigpond.net.au> 2005-02-19 Alan Modra <amodra@bigpond.net.au>
* config/tc-hppa.h (TC_EQUAL_IN_INSN): Delete. * config/tc-hppa.h (TC_EQUAL_IN_INSN): Delete.
@ -205,8 +209,7 @@
2005-02-11 H.J. Lu <hongjiu.lu@intel.com> 2005-02-11 H.J. Lu <hongjiu.lu@intel.com>
(dot_xdata): Undo the last change. Section name is used by * config/tc-ia64.c (dot_xdata): Undo the last change.
set_section.
(dot_float_cons): Likewise. (dot_float_cons): Likewise.
(dot_xstringer): Likewise. (dot_xstringer): Likewise.
(dot_xdata_ua): Likewise. (dot_xdata_ua): Likewise.

24
gas/input-file.c
View file

@ -1,5 +1,6 @@
/* input_file.c - Deal with Input Files - /* 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,
2003, 2005
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -146,21 +147,26 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
file_name = _("{standard input}"); file_name = _("{standard input}");
} }
if (f_in) if (f_in == NULL)
c = getc (f_in); {
#ifdef BFD_ASSEMBLER
bfd_set_error (bfd_error_system_call);
#endif
as_perror (_("Can't open %s for reading"), file_name);
return;
}
if (f_in == NULL || ferror (f_in)) c = getc (f_in);
if (ferror (f_in))
{ {
#ifdef BFD_ASSEMBLER #ifdef BFD_ASSEMBLER
bfd_set_error (bfd_error_system_call); bfd_set_error (bfd_error_system_call);
#endif #endif
as_perror (_("Can't open %s for reading"), file_name); 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; return;
} }