PR binutils/1437

[deliverable/binutils-gdb.git] / gdb / cp-abi.c

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index b75136348dd4a31348435fb5bf8f5648e652233b..f5077856569ea23b2de4d760ec484ebb8dc17ee4 100644 (file)
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -117,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;
 
@@ -134,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)
@@ -145,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
@@ -243,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);
 }