From: Yao Qi <yao@codesourcery.com>
Date: Sat, 23 Nov 2013 08:05:58 +0000 (+0800)
Subject: Use varobj_is_dynamic_p more widely
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=31f628ae8f5aada207d489fbcf5436bdc3b4b3f7;p=binutils-gdb.git

Use varobj_is_dynamic_p more widely

Use varobj_is_dynamic_p more widely so that the callers of
varobj_is_dynamic_p are unchanged when we add available-children-only
stuff in varobj_is_dynamic_p.

gdb:

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

	* varobj.c (varobj_get_num_children): Call
	varobj_is_dynamic_p.
	(varobj_list_children): Likewise.
	(varobj_update): Likewise.  Update comments.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55146f40ac6..d3bd642dc75 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-12  Yao Qi  <yao@codesourcery.com>
+
+	* varobj.c (varobj_get_num_children): Call
+	varobj_is_dynamic_p.
+	(varobj_list_children): Likewise.
+	(varobj_update): Likewise.  Update comments.
+
 2014-06-12  Yao Qi  <yao@codesourcery.com>
 
 	* varobj.c (varobj_pretty_printed_p): Rename to ...
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 94050c6ebd5..8f95cc2c76c 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -895,7 +895,7 @@ varobj_get_num_children (struct varobj *var)
 {
   if (var->num_children == -1)
     {
-      if (var->dynamic->pretty_printer != NULL)
+      if (varobj_is_dynamic_p (var))
 	{
 	  int dummy;
 
@@ -922,7 +922,7 @@ varobj_list_children (struct varobj *var, int *from, int *to)
 
   var->dynamic->children_requested = 1;
 
-  if (var->dynamic->pretty_printer != NULL)
+  if (varobj_is_dynamic_p (var))
     {
       /* This, in theory, can result in the number of children changing without
 	 frontend noticing.  But well, calling -var-list-children on the same
@@ -1724,10 +1724,9 @@ varobj_update (struct varobj **varp, int explicit)
 	    }
 	}
 
-      /* We probably should not get children of a varobj that has a
-	 pretty-printer, but for which -var-list-children was never
-	 invoked.  */
-      if (v->dynamic->pretty_printer != NULL)
+      /* We probably should not get children of a dynamic varobj, but
+	 for which -var-list-children was never invoked.  */
+      if (varobj_is_dynamic_p (v))
 	{
 	  VEC (varobj_p) *changed = 0, *type_changed = 0, *unchanged = 0;
 	  VEC (varobj_p) *new = 0;