[PATCH 07/18] poison "explicit"

Ondrej Oprala
2013-10-21T15:37:41Z

From: Tom Tromey <tromey@redhat.com>

gdb/ChangeLog

2013-10-21 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/mi/mi-cmd-var.c | 8 ++++----
gdb/varobj.c | 4 ++--
gdb/varobj.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)

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 ad42135..4ca4cf4 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1685,7 +1685,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;
@@ -1698,7 +1698,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 87b747e..edec7f9 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -300,7 +300,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