[PATCH 07/18] poison "explicit"

[Ondrej Oprala <ooprala@redhat.com>]

From: Tom Tromey <tromey@redhat.com>

 * mi/mi-cmd-var.c (is_explicit) : Rename from explicit.
 * varobj.c (is_explicit) : Likewise.
 * varobj.h (is_explicit) : Likewise.
---
 gdb/ChangeLog       | 6 ++++++
 gdb/mi/mi-cmd-var.c | 8 ++++----
 gdb/varobj.c        | 4 ++--
 gdb/varobj.h        | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5849dfb..d1909bb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -17,6 +17,12 @@
 
 2013-10-09  Tom Tromey  <tromey@redhat.com>
 
+ * mi/mi-cmd-var.c (is_explicit) : Rename from explicit.
+ * varobj.c (is_explicit) : Likewise.
+ * varobj.h (is_explicit) : Likewise.
+
+2013-10-09  Tom Tromey  <tromey@redhat.com>
+
  * gdbthread.h (private_data) : Renamed from private.
  * inferior.c (private_data) : Likewise.
  * inferior.h (private_data) : Likewise.
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index f32ba69..9424231 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -35,7 +35,7 @@ extern unsigned int varobjdebug;		/* defined in varobj.c.  */
 
 static void varobj_update_one (struct varobj *var,
 			       enum print_values print_values,
-			       int explicit);
+			       int is_explicit);
 
 static int mi_print_value_p (struct varobj *var,
 			     enum print_values print_values);
@@ -705,7 +705,7 @@ mi_cmd_var_update (char *command, char **argv, int argc)
       /* 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 */);
+      varobj_update_one (var, print_values, 1 /* is_explicit */);
     }
 
   do_cleanups (cleanup);
@@ -715,14 +715,14 @@ mi_cmd_var_update (char *command, char **argv, int argc)
 
 static void
 varobj_update_one (struct varobj *var, enum print_values print_values,
-		   int explicit)
+		   int is_explicit)
 {
   struct ui_out *uiout = current_uiout;
   VEC (varobj_update_result) *changes;
   varobj_update_result *r;
   int i;
   
-  changes = varobj_update (&var, explicit);
+  changes = varobj_update (&var, is_explicit);
   
   for (i = 0; VEC_iterate (varobj_update_result, changes, i, r); ++i)
     {
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 60a659f..ef5e8c6 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1948,7 +1948,7 @@ varobj_value_has_mutated (struct varobj *var, struct value *new_value,
    to point to the new varobj.  */
 
 VEC(varobj_update_result) *
-varobj_update (struct varobj **varp, int explicit)
+varobj_update (struct varobj **varp, int is_explicit)
 {
   int type_changed = 0;
   int i;
@@ -1961,7 +1961,7 @@ varobj_update (struct varobj **varp, int explicit)
      changing type.  One use case for frozen varobjs is
      retaining previously evaluated expressions, and we don't
      want them to be reevaluated at all.  */
-  if (!explicit && (*varp)->frozen)
+  if (!is_explicit && (*varp)->frozen)
     return result;
 
   if (!(*varp)->root->is_valid)
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 6e8f71c..2c5544b 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -159,7 +159,7 @@ extern void all_root_varobjs (void (*func) (struct varobj *var, void *data),
 			      void *data);
 
 extern VEC(varobj_update_result) *varobj_update (struct varobj **varp, 
-						 int explicit);
+						 int is_explicit);
 
 extern void varobj_invalidate (void);
 
-- 
1.8.3.1