X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-abi.c;h=f5077856569ea23b2de4d760ec484ebb8dc17ee4;hb=2f168eed4b433e38608527ec7c94c13e38acb632;hp=a8530209c9b5b8e86ff735e229b9fdbfa34ad63f;hpb=37e79b6be74fcfde5f2ba6f7e17f8e6859de0c9f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index a8530209c9..f507785656 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -1,5 +1,6 @@
 /* Generic code for supporting multiple C++ ABI's
-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -40,7 +41,7 @@ enum ctor_kinds
 is_constructor_name (const char *name)
 {
   if ((current_cp_abi.is_constructor_name) == NULL)
-    error ("ABI doesn't define required function is_constructor_name");
+    error (_("ABI doesn't define required function is_constructor_name"));
   return (*current_cp_abi.is_constructor_name) (name);
 }
 
@@ -48,7 +49,7 @@ enum dtor_kinds
 is_destructor_name (const char *name)
 {
   if ((current_cp_abi.is_destructor_name) == NULL)
-    error ("ABI doesn't define required function is_destructor_name");
+    error (_("ABI doesn't define required function is_destructor_name"));
   return (*current_cp_abi.is_destructor_name) (name);
 }
 
@@ -56,7 +57,7 @@ int
 is_vtable_name (const char *name)
 {
   if ((current_cp_abi.is_vtable_name) == NULL)
-    error ("ABI doesn't define required function is_vtable_name");
+    error (_("ABI doesn't define required function is_vtable_name"));
   return (*current_cp_abi.is_vtable_name) (name);
 }
 
@@ -64,16 +65,16 @@ int
 is_operator_name (const char *name)
 {
   if ((current_cp_abi.is_operator_name) == NULL)
-    error ("ABI doesn't define required function is_operator_name");
+    error (_("ABI doesn't define required function is_operator_name"));
   return (*current_cp_abi.is_operator_name) (name);
 }
 
 int
-baseclass_offset (struct type *type, int index, char *valaddr,
+baseclass_offset (struct type *type, int index, const bfd_byte *valaddr,
 		  CORE_ADDR address)
 {
   if (current_cp_abi.baseclass_offset == NULL)
-    error ("ABI doesn't define required function baseclass_offset");
+    error (_("ABI doesn't define required function baseclass_offset"));
   return (*current_cp_abi.baseclass_offset) (type, index, valaddr, address);
 }
 
@@ -116,7 +117,7 @@ register_cp_abi (struct cp_abi_ops *abi)
 {
   if (num_cp_abis == CP_ABI_MAX)
     internal_error (__FILE__, __LINE__,
-		    "Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c");
+		    _("Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c"));
 
   cp_abis[num_cp_abis++] = abi;
 
@@ -133,7 +134,7 @@ set_cp_abi_as_auto_default (const char *short_name)
 
   if (abi == NULL)
     internal_error (__FILE__, __LINE__,
-		    "Cannot find C++ ABI \"%s\" to set it as auto default.",
+		    _("Cannot find C++ ABI \"%s\" to set it as auto default."),
 		    short_name);
 
   if (auto_cp_abi.longname != NULL)
@@ -144,14 +145,11 @@ set_cp_abi_as_auto_default (const char *short_name)
   auto_cp_abi = *abi;
 
   auto_cp_abi.shortname = "auto";
-  new_longname = xmalloc (strlen ("currently ") + 1 + strlen (abi->shortname)
-			  + 1 + 1);
-  sprintf (new_longname, "currently \"%s\"", abi->shortname);
+  xasprintf (&new_longname, "currently \"%s\"", abi->shortname);
   auto_cp_abi.longname = new_longname;
 
-  new_doc = xmalloc (strlen ("Automatically selected; currently ")
-		     + 1 + strlen (abi->shortname) + 1 + 1);
-  sprintf (new_doc, "Automatically selected; currently \"%s\"", abi->shortname);
+  xasprintf (&new_doc, "Automatically selected; currently \"%s\"",
+	     abi->shortname);
   auto_cp_abi.doc = new_doc;
 
   /* Since we copy the current ABI into current_cp_abi instead of
@@ -218,7 +216,7 @@ set_cp_abi_cmd (char *args, int from_tty)
     }
 
   if (!switch_to_cp_abi (args))
-    error ("Could not find \"%s\" in ABI list", args);
+    error (_("Could not find \"%s\" in ABI list"), args);
 }
 
 /* Show the currently selected C++ ABI.  */
@@ -242,11 +240,11 @@ _initialize_cp_abi (void)
   register_cp_abi (&auto_cp_abi);
   switch_to_cp_abi ("auto");
 
-  add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd,
-	   "Set the ABI used for inspecting C++ objects.\n"
-	   "\"set cp-abi\" with no arguments will list the available ABIs.",
+  add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\
+Set the ABI used for inspecting C++ objects.\n\
+\"set cp-abi\" with no arguments will list the available ABIs."),
 	   &setlist);
 
   add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
-	   "Show the ABI used for inspecting C++ objects.", &showlist);
+	   _("Show the ABI used for inspecting C++ objects."), &showlist);
 }