* cris-dis.c (format_hex): Remove ineffective warning fix.

[deliverable/binutils-gdb.git] / gdb / utils.c

diff --git a/gdb/utils.c b/gdb/utils.c
index c66496f0157d373af88b0af10a2047a6c29f216f..9c27b495e06a2c6a7cb2f21df7727e1876760c30 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2446,29 +2446,36 @@ initialize_utils (void)
 {
   struct cmd_list_element *c;
 
-  c = add_set_cmd ("width", class_support, var_uinteger, &chars_per_line,
-                  "Set number of characters gdb thinks are in a line.",
-                  &setlist);
-  deprecated_add_show_from_set (c, &showlist);
-  set_cmd_sfunc (c, set_width_command);
-
-  c = add_set_cmd ("height", class_support, var_uinteger, &lines_per_page,
-                  "Set number of lines gdb thinks are in a page.", &setlist);
-  deprecated_add_show_from_set (c, &showlist);
-  set_cmd_sfunc (c, set_height_command);
+  add_setshow_uinteger_cmd ("width", class_support, &chars_per_line, _("\
+Set number of characters gdb thinks are in a line."), _("\
+Show number of characters gdb thinks are in a line."), NULL,
+                           set_width_command,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
+
+  add_setshow_uinteger_cmd ("height", class_support, &lines_per_page, _("\
+Set number of lines gdb thinks are in a page."), _("\
+Show number of lines gdb thinks are in a page."), NULL,
+                           set_height_command,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
 
   init_page_info ();
 
-  deprecated_add_show_from_set
-    (add_set_cmd ("demangle", class_support, var_boolean,
-                 (char *) &demangle,
-                 "Set demangling of encoded C++/ObjC names when displaying symbols.",
-                 &setprintlist), &showprintlist);
-
-  deprecated_add_show_from_set
-    (add_set_cmd ("pagination", class_support,
-                 var_boolean, (char *) &pagination_enabled,
-                 "Set state of pagination.", &setlist), &showlist);
+  add_setshow_boolean_cmd ("demangle", class_support, &demangle, _("\
+Set demangling of encoded C++/ObjC names when displaying symbols."), _("\
+Show demangling of encoded C++/ObjC names when displaying symbols."), NULL,
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setprintlist, &showprintlist);
+
+  add_setshow_boolean_cmd ("pagination", class_support,
+                          &pagination_enabled, _("\
+Set state of pagination."), _("\
+Show state of pagination."), NULL,
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setlist, &showlist);
 
   if (xdb_commands)
     {
@@ -2478,17 +2485,20 @@ initialize_utils (void)
               _("Disable pagination"));
     }
 
-  deprecated_add_show_from_set
-    (add_set_cmd ("sevenbit-strings", class_support, var_boolean,
-                 (char *) &sevenbit_strings,
-                 "Set printing of 8-bit characters in strings as \\nnn.",
-                 &setprintlist), &showprintlist);
-
-  deprecated_add_show_from_set
-    (add_set_cmd ("asm-demangle", class_support, var_boolean,
-                 (char *) &asm_demangle,
-                 "Set demangling of C++/ObjC names in disassembly listings.",
-                 &setprintlist), &showprintlist);
+  add_setshow_boolean_cmd ("sevenbit-strings", class_support,
+                          &sevenbit_strings, _("\
+Set printing of 8-bit characters in strings as \\nnn."), _("\
+Show printing of 8-bit characters in strings as \\nnn."), NULL,
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setprintlist, &showprintlist);
+
+  add_setshow_boolean_cmd ("asm-demangle", class_support, &asm_demangle, _("\
+Set demangling of C++/ObjC names in disassembly listings."), _("\
+Show demangling of C++/ObjC names in disassembly listings."), NULL,
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setprintlist, &showprintlist);
 }
 
 /* Machine specific function to handle SIGWINCH signal. */