Merge GDB 7.5.1

gdb/mi/mi-cmd-var.c

 /* MI Command Set - varobj commands.
-
    Copyright (C) 2000, 2002, 2004-2005, 2007-2012 Free Software
    Foundation, Inc.
 
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 18 matching lines @@
 #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";
 
 extern int varobjdebug;         /* defined in varobj.c.  */
 
 static void varobj_update_one (struct varobj *var,
-                              enum print_values print_values,
-                              int explicit);
+                               enum print_values print_values,
+                               int explicit);
 
 static int mi_print_value_p (struct varobj *var,
                              enum print_values print_values);
 
 /* Print variable object VAR.  The PRINT_VALUES parameter controls
    if the value should be printed.  The PRINT_EXPRESSION parameter
    controls if the expression should be printed.  */
+
 static void 
 print_varobj (struct varobj *var, enum print_values print_values,
               int print_expression)
 {
   struct ui_out *uiout = current_uiout;
   char *type;
   int thread_id;
   char *display_hint;
 
   ui_out_field_string (uiout, "name", varobj_get_objname (var));
@@ skipping 42 matching lines @@
   struct ui_out *uiout = current_uiout;
   CORE_ADDR frameaddr = 0;
   struct varobj *var;
   char *name;
   char *frame;
   char *expr;
   struct cleanup *old_cleanups;
   enum varobj_type var_type;
 
   if (argc != 3)
-    {
-      /* mi_error_message = xstrprintf ("-var-create: Usage:
-         ...."); return MI_CMD_ERROR; */
-      error (_("-var-create: Usage: NAME FRAME EXPRESSION."));
-    }
+    error (_("-var-create: Usage: NAME FRAME EXPRESSION."));
 
   name = xstrdup (argv[0]);
-  /* Add cleanup for name. Must be free_current_contents as
-     name can be reallocated */
+  /* Add cleanup for name. Must be free_current_contents as name can
+     be reallocated.  */
   old_cleanups = make_cleanup (free_current_contents, &name);
 
   frame = xstrdup (argv[1]);
   make_cleanup (xfree, frame);
 
   expr = xstrdup (argv[2]);
   make_cleanup (xfree, expr);
 
   if (strcmp (name, "-") == 0)
     {
@@ skipping 37 matching lines @@
   struct varobj *var;
   int numdel;
   int children_only_p = 0;
   struct cleanup *old_cleanups;
   struct ui_out *uiout = current_uiout;
 
   if (argc < 1 || argc > 2)
     error (_("-var-delete: Usage: [-c] EXPRESSION."));
 
   name = xstrdup (argv[0]);
-  /* Add cleanup for name. Must be free_current_contents as
-     name can be reallocated */
+  /* Add cleanup for name. Must be free_current_contents as name can
+     be reallocated.  */
   old_cleanups = make_cleanup (free_current_contents, &name);
 
   /* If we have one single argument it cannot be '-c' or any string
-     starting with '-'. */
+     starting with '-'.  */
   if (argc == 1)
     {
       if (strcmp (name, "-c") == 0)
         error (_("-var-delete: Missing required "
                  "argument after '-c': variable object name"));
       if (*name == '-')
         error (_("-var-delete: Illegal variable object name"));
     }
 
   /* If we have 2 arguments they must be '-c' followed by a string
-     which would be the variable name. */
+     which would be the variable name.  */
   if (argc == 2)
     {
       if (strcmp (name, "-c") != 0)
         error (_("-var-delete: Invalid option."));
       children_only_p = 1;
       do_cleanups (old_cleanups);
       name = xstrdup (argv[1]);
       old_cleanups = make_cleanup (free_current_contents, &name);
     }
 
   /* If we didn't error out, now NAME contains the name of the
-     variable. */
+     variable.  */
 
   var = varobj_get_handle (name);
 
   numdel = varobj_delete (var, NULL, children_only_p);
 
   ui_out_field_int (uiout, "ndeleted", numdel);
 
   do_cleanups (old_cleanups);
 }
 
@@ skipping 28 matching lines @@
 mi_cmd_var_set_format (char *command, char **argv, int argc)
 {
   enum varobj_display_formats format;
   struct varobj *var;
   char *val;
   struct ui_out *uiout = current_uiout;
 
   if (argc != 2)
     error (_("-var-set-format: Usage: NAME FORMAT."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   format = mi_parse_format (argv[1]);
   
-  /* Set the format of VAR to given format */
+  /* Set the format of VAR to the given format.  */
   varobj_set_display_format (var, format);
 
-  /* Report the new current format */
+  /* Report the new current format.  */
   ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
  
-  /* Report the value in the new format */
+  /* Report the value in the new format.  */
   val = varobj_get_value (var);
   ui_out_field_string (uiout, "value", val);
   xfree (val);
 }
 
 void
 mi_cmd_var_set_visualizer (char *command, char **argv, int argc)
 {
   struct varobj *var;
 
@@ skipping 21 matching lines @@
 
   if (strcmp (argv[1], "0") == 0)
     frozen = 0;
   else if (strcmp (argv[1], "1") == 0)
     frozen = 1;
   else
     error (_("Invalid flag value"));
 
   varobj_set_frozen (var, frozen);
 
-  /* We don't automatically return the new value, or what varobjs got new
-     values during unfreezing.  If this information is required, client
-     should call -var-update explicitly.  */
+  /* We don't automatically return the new value, or what varobjs got
+     new values during unfreezing.  If this information is required,
+     client should call -var-update explicitly.  */
 }
 
-
 void
 mi_cmd_var_show_format (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   enum varobj_display_formats format;
   struct varobj *var;
 
   if (argc != 1)
     error (_("-var-show-format: Usage: NAME."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   format = varobj_get_display_format (var);
 
-  /* Report the current format */
+  /* Report the current format.  */
   ui_out_field_string (uiout, "format", varobj_format_string[(int) format]);
 }
 
 void
 mi_cmd_var_info_num_children (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct varobj *var;
 
   if (argc != 1)
     error (_("-var-info-num-children: Usage: NAME."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   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)
 {
@@ skipping 53 matching lines @@
   struct varobj *child;
   enum print_values print_values;
   int ix;
   int from, to;
   char *display_hint;
 
   if (argc < 1 || argc > 4)
     error (_("-var-list-children: Usage: "
              "[PRINT_VALUES] NAME [FROM TO]"));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   if (argc == 1 || argc == 3)
     var = varobj_get_handle (argv[0]);
   else
     var = varobj_get_handle (argv[1]);
 
   if (argc > 2)
     {
       from = atoi (argv[argc - 2]);
       to = atoi (argv[argc - 1]);
     }
@@ skipping 45 matching lines @@
 
 void
 mi_cmd_var_info_type (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct varobj *var;
 
   if (argc != 1)
     error (_("-var-info-type: Usage: NAME."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   ui_out_field_string (uiout, "type", varobj_get_type (var));
 }
 
 void
 mi_cmd_var_info_path_expression (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct varobj *var;
@@ skipping 13 matching lines @@
 void
 mi_cmd_var_info_expression (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   enum varobj_languages lang;
   struct varobj *var;
 
   if (argc != 1)
     error (_("-var-info-expression: Usage: NAME."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   lang = varobj_get_language (var);
 
   ui_out_field_string (uiout, "lang", varobj_language_string[(int) lang]);
   ui_out_field_string (uiout, "exp", varobj_get_expression (var));
 }
 
 void
 mi_cmd_var_show_attributes (char *command, char **argv, int argc)
@@ skipping 20 matching lines @@
 }
 
 void
 mi_cmd_var_evaluate_expression (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct varobj *var;
 
   enum varobj_display_formats format;
   int formatFound;
-  int optind;
-  char *optarg;
+  int oind;
+  char *oarg;
     
   enum opt
+  {
+    OP_FORMAT
+  };
+  static const struct mi_opt opts[] =
     {
-      OP_FORMAT
+      {"f", OP_FORMAT, 1},
+      { 0, 0, 0 }
     };
-  static const struct mi_opt opts[] =
-  {
-    {"f", OP_FORMAT, 1},
-    { 0, 0, 0 }
-  };
 
-  /* Parse arguments */
+  /* Parse arguments.  */
   format = FORMAT_NATURAL;
   formatFound = 0;
-  optind = 0;
+  oind = 0;
   while (1)
     {
       int opt = mi_getopt ("-var-evaluate-expression", argc, argv,
-                           opts, &optind, &optarg);
+                           opts, &oind, &oarg);
 
       if (opt < 0)
         break;
       switch ((enum opt) opt)
-      {
+        {
         case OP_FORMAT:
           if (formatFound)
             error (_("Cannot specify format more than once"));
    
-          format = mi_parse_format (optarg);
+          format = mi_parse_format (oarg);
           formatFound = 1;
           break;
-      }
+        }
     }
 
-  if (optind >= argc)
+  if (oind >= argc)
     error (_("Usage: [-f FORMAT] NAME"));
    
-  if (optind < argc - 1)
+  if (oind < argc - 1)
     error (_("Garbage at end of command"));
  
-     /* Get varobj handle, if a valid var obj name was specified */
-  var = varobj_get_handle (argv[optind]);
+  /* Get varobj handle, if a valid var obj name was specified.  */
+  var = varobj_get_handle (argv[oind]);
    
   if (formatFound)
     {
       char *val = varobj_get_formatted_value (var, format);
 
       ui_out_field_string (uiout, "value", val);
       xfree (val);
     }
   else
     {
       char *val = varobj_get_value (var);
 
       ui_out_field_string (uiout, "value", val);
       xfree (val);
     }
 }
 
 void
 mi_cmd_var_assign (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct varobj *var;
   char *expression, *val;
 
   if (argc != 2)
     error (_("-var-assign: Usage: NAME EXPRESSION."));
 
-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid var obj name was specified.  */
   var = varobj_get_handle (argv[0]);
 
   if (!varobj_editable_p (var))
     error (_("-var-assign: Variable object is not editable"));
 
   expression = xstrdup (argv[1]);
 
   if (!varobj_set_value (var, expression))
     error (_("-var-assign: Could not assign "
              "expression to variable object"));
@@ skipping 26 matching lines @@
   else
     {
       struct thread_info *tp = find_thread_id (thread_id);
 
       if (tp)
         thread_stopped = is_stopped (tp->ptid);
       else
         thread_stopped = 1;
     }
 
-  if (thread_stopped)
-    if (!data->only_floating || varobj_floating_p (var))
-      varobj_update_one (var, data->print_values, 0 /* implicit */);
+  if (thread_stopped
+      && (!data->only_floating || varobj_floating_p (var)))
+    varobj_update_one (var, data->print_values, 0 /* implicit */);
 }
 
 void
 mi_cmd_var_update (char *command, char **argv, int argc)
 {
   struct ui_out *uiout = current_uiout;
   struct cleanup *cleanup;
   char *name;
   enum print_values print_values;
 
   if (argc != 1 && argc != 2)
     error (_("-var-update: Usage: [PRINT_VALUES] NAME."));
 
   if (argc == 1)
     name = argv[0];
   else
-    name = (argv[1]);
+    name = argv[1];
 
   if (argc == 2)
     print_values = mi_parse_values_option (argv[0]);
   else
     print_values = PRINT_NO_VALUES;
 
   if (mi_version (uiout) <= 1)
     cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "changelist");
   else
     cleanup = make_cleanup_ui_out_list_begin_end (uiout, "changelist");
 
-  /* Check if the parameter is a "*" which means that we want
-     to update all variables */
+  /* Check if the parameter is a "*", which means that we want to
+     update all variables.  */
 
   if ((*name == '*' || *name == '@') && (*(name + 1) == '\0'))
     {
       struct mi_cmd_var_update data;
 
-      data.only_floating = *name == '@';
+      data.only_floating = (*name == '@');
       data.print_values = print_values;
 
-      /* varobj_update_one automatically updates all the children of VAROBJ.
-         Therefore update each VAROBJ only once by iterating only the root
-         VAROBJs.  */
+      /* varobj_update_one automatically updates all the children of
+         VAROBJ.  Therefore update each VAROBJ only once by iterating
+         only the root VAROBJs.  */
 
       all_root_varobjs (mi_cmd_var_update_iter, &data);
     }
   else
     {
-      /* Get varobj handle, if a valid var obj name was specified */
+      /* Get varobj handle, if a valid var obj name was specified.  */
       struct varobj *var = varobj_get_handle (name);
 
       varobj_update_one (var, print_values, 1 /* explicit */);
     }
 
   do_cleanups (cleanup);
 }
 
 /* Helper for mi_cmd_var_update().  */
 
@@ skipping 93 matching lines @@
         do_cleanups (cleanup);
     }
   VEC_free (varobj_update_result, changes);
 }
 
 void
 mi_cmd_enable_pretty_printing (char *command, char **argv, int argc)
 {
   if (argc != 0)
     error (_("-enable-pretty-printing: no arguments allowed"));
+
   varobj_enable_pretty_printing ();
 }
 
 void
 mi_cmd_var_set_update_range (char *command, char **argv, int argc)
 {
   struct varobj *var;
   int from, to;
 
   if (argc != 3)
     error (_("-var-set-update-range: Usage: VAROBJ FROM TO"));
   
   var = varobj_get_handle (argv[0]);
   from = atoi (argv[1]);
   to = atoi (argv[2]);
 
   varobj_set_child_range (var, from, to);
 }