X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Finput-file.c;h=5c4bb3109f954029cbdb98128ccc2cb3bfda926e;hb=9cc4ce88316e666fd5af0fbc1ea110a7dc42adb0;hp=ecf1b44be9fbde489791917d27c6b3d7bdaf08c3;hpb=34bca50861dd6a0d59b8f8b215865e3a52895191;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/input-file.c b/gas/input-file.c index ecf1b44be9..5c4bb3109f 100644 --- a/gas/input-file.c +++ b/gas/input-file.c @@ -1,7 +1,5 @@ /* 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-2020 Free Software Foundation, Inc. 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; -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,9 +79,9 @@ input_file_buffer_size (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; @@ -100,7 +98,7 @@ input_file_push (void) 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. */ @@ -113,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;