X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Finput-file.c;h=8b9830f07386b0861008fee2ab50af9de9e59e77;hb=86b80085c889cd388fa677a5ae9053fd4be3776c;hp=f1f2ec5893c870c4593c4d9dce511755b7371cd0;hpb=ed9e98c214dde25cc9ff54bac7191c3824be3ffa;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/input-file.c b/gas/input-file.c index f1f2ec5893..8b9830f073 100644 --- a/gas/input-file.c +++ b/gas/input-file.c @@ -1,5 +1,5 @@ /* input_file.c - Deal with Input Files - - Copyright (C) 1987-2014 Free Software Foundation, Inc. + Copyright (C) 1987-2016 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -42,13 +42,13 @@ int preprocess = 0; /* We use static data: the data area is not sharable. */ static FILE *f_in; -static char *file_name; +static const char *file_name; /* Struct for saving the state of this module for file includes. */ struct saved_file { FILE * f_in; - char * file_name; + const char * file_name; int preprocess; char * app_save; }; @@ -81,7 +81,7 @@ input_file_push (void) { 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; @@ -111,8 +111,10 @@ input_file_pop (char *arg) free (arg); } +/* Open the specified file, "" means stdin. Filename must not be null. */ + void -input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ +input_file_open (const char *filename, int pre) { int c;