gdb/

	* mi/mi-cmd-var.c (mi_no_values, mi_simple_values): Move to
	mi-parse.c.  Make them static.
	(mi_all_values): Likewise.
	(mi_parse_values_option): Move to mi-parse.c.  Rename it to
	mi_parse_print_values.  Make it external.
	* mi/mi-cmds.h (mi_no_values, mi_simple_values, mi_all_values):
	Remove the declarations.
	* mi/mi-parse.c (mi_parse_print_values): Moved from mi-cmd-var.c.
	* mi/mi-parse.h (mi_parse_print_values): Declare.
	* mi/mi-cmd-stack.c: Include mi-parse.h.
	(parse_print_values): Remove
	(mi_cmd_stack_list_locals): Call mi_parse_print_values instead
	of parse_print_values.
	(mi_cmd_stack_list_args, mi_cmd_stack_list_variables): Likewise.

1 files changed, 3 insertions, 26 deletions

diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index a069346..57a2f6b 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -29,10 +29,7 @@
 #include "gdb_string.h"
 #include "mi-getopt.h"
 #include "gdbthread.h"
-
-const char mi_no_values[] = "--no-values";
-const char mi_simple_values[] = "--simple-values";
-const char mi_all_values[] = "--all-values";
+#include "mi-parse.h"
 
 extern unsigned int varobjdebug;		/* defined in varobj.c.  */
 
@@ -340,26 +337,6 @@ mi_cmd_var_info_num_children (char *command, char **argv, int argc)
   ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
 }
 
-/* Parse a string argument into a print_values value.  */
-
-static enum print_values
-mi_parse_values_option (const char *arg)
-{
-  if (strcmp (arg, "0") == 0
-      || strcmp (arg, mi_no_values) == 0)
-    return PRINT_NO_VALUES;
-  else if (strcmp (arg, "1") == 0
-	   || strcmp (arg, mi_all_values) == 0)
-    return PRINT_ALL_VALUES;
-  else if (strcmp (arg, "2") == 0
-	   || strcmp (arg, mi_simple_values) == 0)
-    return PRINT_SIMPLE_VALUES;
-  else
-    error (_("Unknown value for PRINT_VALUES\n\
-Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""),
-	   mi_no_values, mi_simple_values, mi_all_values);
-}
-
 /* Return 1 if given the argument PRINT_VALUES we should display
    the varobj VAR.  */
 
@@ -428,7 +405,7 @@ mi_cmd_var_list_children (char *command, char **argv, int argc)
   children = varobj_list_children (var, &from, &to);
   ui_out_field_int (uiout, "numchild", to - from);
   if (argc == 2 || argc == 4)
-    print_values = mi_parse_values_option (argv[0]);
+    print_values = mi_parse_print_values (argv[0]);
   else
     print_values = PRINT_NO_VALUES;
 
@@ -698,7 +675,7 @@ mi_cmd_var_update (char *command, char **argv, int argc)
     name = argv[1];
 
   if (argc == 2)
-    print_values = mi_parse_values_option (argv[0]);
+    print_values = mi_parse_print_values (argv[0]);
   else
     print_values = PRINT_NO_VALUES;