Rename varobj_pretty_printed_p to varobj_is_dynamic_p

We think varobj with --available-children-only behaves like a dynamic
varobj, so dyanmic varobj is not pretty-printer specific.  We rename
varobj_pretty_printed_p to varobj_is_dynamic_p, so that we can handle
available-children-only checking in varobj_is_dynamic_p in the next
patch.

gdb:

2014-06-12  Yao Qi  <yao@codesourcery.com>

	* varobj.c (varobj_pretty_printed_p): Rename to ...
	(varobj_is_dynamic_p): ... this.  New function.
	* varobj.h (varobj_pretty_printed_p): Remove declaration.
	(varobj_is_dynamic_p): Declare.
	* mi/mi-cmd-var.c (print_varobj): All callers updated.
	(mi_print_value_p, varobj_update_one): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 03ba56a009b229072a6449d84ccd336991e4fa17..55146f40ac6f48030f2ad6976890b7ee3ee4a560 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-12  Yao Qi  <yao@codesourcery.com>
+
+       * varobj.c (varobj_pretty_printed_p): Rename to ...
+       (varobj_is_dynamic_p): ... this.  New function.
+       * varobj.h (varobj_pretty_printed_p): Remove declaration.
+       (varobj_is_dynamic_p): Declare.
+       * mi/mi-cmd-var.c (print_varobj): All callers updated.
+       (mi_print_value_p, varobj_update_one): Likewise.
+
 2014-06-12  Pedro Alves  <pedro@codesourcery.com>
            Yao Qi  <yao@codesourcery.com>
 

diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index f68dba62b60481d4b3cd052674691cdd6c4e0771..90596161a7f83f8edbfeced487cf94725650efbc 100644 (file)
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -88,7 +88,7 @@ print_varobj (struct varobj *var, enum print_values print_values,
       xfree (display_hint);
     }
 
-  if (varobj_pretty_printed_p (var))
+  if (varobj_is_dynamic_p (var))
     ui_out_field_int (uiout, "dynamic", 1);
 }
 
@@ -352,7 +352,7 @@ mi_print_value_p (struct varobj *var, enum print_values print_values)
   if (print_values == PRINT_ALL_VALUES)
     return 1;
 
-  if (varobj_pretty_printed_p (var))
+  if (varobj_is_dynamic_p (var))
     return 1;
 
   type = varobj_get_gdb_type (var);
@@ -777,7 +777,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
          xfree (display_hint);
        }
 
-      if (varobj_pretty_printed_p (r->varobj))
+      if (varobj_is_dynamic_p (r->varobj))
        ui_out_field_int (uiout, "dynamic", 1);
 
       varobj_get_child_range (r->varobj, &from, &to);

diff --git a/gdb/varobj.c b/gdb/varobj.c
index b9712581e24cc1bde733d31e67e63038ce8784e7..94050c6ebd5011680a83b9c9dd974e7d50585fa5 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1066,8 +1066,10 @@ varobj_get_attributes (struct varobj *var)
   return attributes;
 }
 
+/* Return true if VAR is a dynamic varobj.  */
+
 int
-varobj_pretty_printed_p (struct varobj *var)
+varobj_is_dynamic_p (struct varobj *var)
 {
   return var->dynamic->pretty_printer != NULL;
 }

diff --git a/gdb/varobj.h b/gdb/varobj.h
index 991c2e8f9e1645a81556d96ed261ac3db8698ee1..74d41cf0cf124f35b33c97d75a378504541fece9 100644 (file)
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -306,7 +306,7 @@ extern void varobj_enable_pretty_printing (void);
 
 extern int varobj_has_more (struct varobj *var, int to);
 
-extern int varobj_pretty_printed_p (struct varobj *var);
+extern int varobj_is_dynamic_p (struct varobj *var);
 
 extern struct cleanup *varobj_ensure_python_env (struct varobj *var);