projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RISC-V: Fix two ARI warnings.
[deliverable/binutils-gdb.git]
/
gas
/
input-file.c
diff --git
a/gas/input-file.c
b/gas/input-file.c
index a864e4bdc812744b97d27c668ae47ab11726a74c..79910b9d37a58ee9bdca27808d399cc7abec770d 100644
(file)
--- a/
gas/input-file.c
+++ b/
gas/input-file.c
@@
-1,7
+1,5
@@
/* 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,
- 2002, 2003, 2005, 2006, 2007, 2009, 2012
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2019 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-44,13
+42,13
@@
int preprocess = 0;
/* We use static data: the data area is not sharable. */
static FILE *f_in;
/* We use static data: the data area is not sharable. */
static FILE *f_in;
-static char *file_name;
+static c
onst c
har *file_name;
/* Struct for saving the state of this module for file includes. */
struct saved_file
{
FILE * f_in;
/* Struct for saving the state of this module for file includes. */
struct saved_file
{
FILE * f_in;
- char * file_name;
+ c
onst c
har * file_name;
int preprocess;
char * app_save;
};
int preprocess;
char * app_save;
};
@@
-81,9
+79,9
@@
input_file_buffer_size (void)
char *
input_file_push (void)
{
char *
input_file_push (void)
{
-
register
struct saved_file *saved;
+ struct saved_file *saved;
- saved =
(struct saved_file *) xmalloc (sizeof *saved
);
+ saved =
XNEW (struct saved_file
);
saved->f_in = f_in;
saved->file_name = file_name;
saved->f_in = f_in;
saved->file_name = file_name;
@@
-100,7
+98,7
@@
input_file_push (void)
void
input_file_pop (char *arg)
{
void
input_file_pop (char *arg)
{
-
register
struct saved_file *saved = (struct saved_file *) arg;
+ struct saved_file *saved = (struct saved_file *) arg;
input_file_end (); /* Close out old file. */
input_file_end (); /* Close out old file. */
@@
-113,8
+111,10
@@
input_file_pop (char *arg)
free (arg);
}
\f
free (arg);
}
\f
+/* Open the specified file, "" means stdin. Filename must not be null. */
+
void
void
-input_file_open (c
har *filename, /* "" means use stdin. Must not be 0. */
+input_file_open (c
onst char *filename,
int pre)
{
int c;
int pre)
{
int c;
@@
-218,7
+218,7
@@
input_file_get (char *buf, size_t buflen)
if (feof (f_in))
return 0;
if (feof (f_in))
return 0;
-
+
size = fread (buf, sizeof (char), buflen, f_in);
if (ferror (f_in))
as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
size = fread (buf, sizeof (char), buflen, f_in);
if (ferror (f_in))
as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
This page took
0.024734 seconds
and
4
git commands to generate.