* linux-nat.c (enum sigchld_state): Delete.

[deliverable/binutils-gdb.git] / gdb / symfile-mem.c

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 29ef92688e0f9edca326c81e18073de8b802ca4a..e336350f9f65c3c4ec4126fe3dd1061d97dacb33 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -1,13 +1,13 @@
 /* Reading symbol files from memory.
 
-   Copyright 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000,
-   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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 of the License, or
+   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,
@@ -16,9 +16,7 @@
    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 file defines functions (and commands to exercise those
    functions) for reading debugging information from object files
@@ -48,6 +46,7 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"
+#include "exceptions.h"
 #include "gdbcmd.h"
 #include "target.h"
 #include "value.h"
@@ -74,12 +73,12 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name,
   unsigned int i;
 
   if (bfd_get_flavour (templ) != bfd_target_elf_flavour)
-    error ("add-symbol-file-from-memory not supported for this target");
+    error (_("add-symbol-file-from-memory not supported for this target"));
 
   nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
                                         target_read_memory);
   if (nbfd == NULL)
-    error ("Failed to read a valid object file image from memory.");
+    error (_("Failed to read a valid object file image from memory."));
 
   if (name == NULL)
     nbfd->filename = xstrdup ("shared object read from target memory");
@@ -92,7 +91,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name,
          on error it does not free all the storage associated with the
          bfd).  */
       bfd_close (nbfd);
-      error ("Got object file from memory but can't read symbols: %s.",
+      error (_("Got object file from memory but can't read symbols: %s."),
             bfd_errmsg (bfd_get_error ()));
     }
 
@@ -125,7 +124,7 @@ add_symbol_file_from_memory_command (char *args, int from_tty)
   struct bfd *templ;
 
   if (args == NULL)
-    error ("add-symbol-file-from-memory requires an expression argument");
+    error (_("add-symbol-file-from-memory requires an expression argument"));
 
   addr = parse_and_eval_address (args);
 
@@ -135,8 +134,8 @@ add_symbol_file_from_memory_command (char *args, int from_tty)
   else
     templ = exec_bfd;
   if (templ == NULL)
-    error ("\
-Must use symbol-file or exec-file before add-symbol-file-from-memory.");
+    error (_("\
+Must use symbol-file or exec-file before add-symbol-file-from-memory."));
 
   symbol_file_add_from_memory (templ, addr, NULL, from_tty);
 }
@@ -190,32 +189,36 @@ add_vsyscall_page (struct target_ops *target, int from_tty)
          ``bfd_runtime'' (a BFD created using the loaded image) file
          format should fix this.  */
        {
-         warning ("could not load vsyscall page because no executable was specified");
-         warning ("try using the \"file\" command first");
+         warning (_("\
+Could not load vsyscall page because no executable was specified\n\
+try using the \"file\" command first."));
          return;
        }
       args.bfd = bfd;
       args.sysinfo_ehdr = sysinfo_ehdr;
-      xasprintf (&args.name, "system-supplied DSO at 0x%s",
+      args.name = xstrprintf ("system-supplied DSO at 0x%s",
                 paddr_nz (sysinfo_ehdr));
       /* Pass zero for FROM_TTY, because the action of loading the
         vsyscall DSO was not triggered by the user, even if the user
         typed "run" at the TTY.  */
       args.from_tty = 0;
       catch_exceptions (uiout, symbol_file_add_from_memory_wrapper,
-                       &args, NULL, RETURN_MASK_ALL);
+                       &args, RETURN_MASK_ALL);
     }
 }
 
 \f
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_symfile_mem;
+
 void
 _initialize_symfile_mem (void)
 {
   add_cmd ("add-symbol-file-from-memory", class_files,
-           add_symbol_file_from_memory_command,
-           "\
+           add_symbol_file_from_memory_command, _("\
 Load the symbols out of memory from a dynamically loaded object file.\n\
-Give an expression for the address of the file's shared object file header.",
+Give an expression for the address of the file's shared object file header."),
            &cmdlist);
 
   /* Want to know of each new inferior so that its vsyscall info can