* cris/semcrisv32f-switch.c: Regenerate.

[deliverable/binutils-gdb.git] / sim / common / sim-load.c

diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index c140bebd4526c4b608ed002761069b53194f0eca..89ab21342d482b465194fec2ee0ea0e5ec256533 100644 (file)
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -1,10 +1,11 @@
 /* Utility to load a file into the simulator.
-   Copyright (C) 1997, 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2001, 2002, 2004, 2007, 2008
+   Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* This is a standalone loader, independent of the sim-basic.h machinery,
    as it is used by simulators that don't use it [though that doesn't mean
@@ -172,8 +172,6 @@ sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
 static void
 xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 {
-  host_callback *callback;
-  char *fmt;
   va_list ap;
 
   VA_START (ap, fmt);
@@ -186,8 +184,6 @@ xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 static void
 eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 {
-  host_callback *callback;
-  char *fmt;
   va_list ap;
 
   VA_START (ap, fmt);