2005-02-14 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 7a4549f1eeaed0689bfb16748b090b4ac25c5c2d..6e2fca4c2c7dece55f5afab60fc091b96af807c4 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -58,6 +58,15 @@
 #include "elf/common.h"
 
 
+/* FIXME: cagney/2005-01-27: Should be a function with the signature:
+   int (void *object, const bfd_byte *myaddr, int len).  */
+
+static int
+do_target_read_memory (bfd_vma vma, char *myaddr, int len)
+{
+  return target_read_memory (vma, myaddr, len);
+}
+
 /* Read inferior memory at ADDR to find the header of a loaded object file
    and read its in-core symbols out of inferior memory.  TEMPL is a bfd
    representing the target's format.  NAME is the name to use for this
@@ -75,12 +84,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);
+                                        do_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");
@@ -93,7 +102,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 ()));
     }
 
@@ -126,7 +135,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);
 
@@ -136,8 +145,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);
 }
@@ -191,8 +200,9 @@ 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;
@@ -204,7 +214,7 @@ add_vsyscall_page (struct target_ops *target, int from_tty)
         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);
     }
 }
 
@@ -213,10 +223,9 @@ 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