diff options
Diffstat (limited to 'gdb/varobj.c')
| -rw-r--r-- | gdb/varobj.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/gdb/varobj.c b/gdb/varobj.c index 43ea96f..ce80bc7 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -702,7 +702,7 @@ static void install_dynamic_child (struct varobj *var, VEC (varobj_p) **changed, VEC (varobj_p) **type_changed, - VEC (varobj_p) **new, + VEC (varobj_p) **newobj, VEC (varobj_p) **unchanged, int *cchanged, int index, @@ -713,9 +713,9 @@ install_dynamic_child (struct varobj *var, /* There's no child yet. */ struct varobj *child = varobj_add_child (var, item); - if (new) + if (newobj) { - VEC_safe_push (varobj_p, *new, child); + VEC_safe_push (varobj_p, *newobj, child); *cchanged = 1; } } @@ -790,7 +790,7 @@ static int update_dynamic_varobj_children (struct varobj *var, VEC (varobj_p) **changed, VEC (varobj_p) **type_changed, - VEC (varobj_p) **new, + VEC (varobj_p) **newobj, VEC (varobj_p) **unchanged, int *cchanged, int update_children, @@ -851,7 +851,7 @@ update_dynamic_varobj_children (struct varobj *var, install_dynamic_child (var, can_mention ? changed : NULL, can_mention ? type_changed : NULL, - can_mention ? new : NULL, + can_mention ? newobj : NULL, can_mention ? unchanged : NULL, can_mention ? cchanged : NULL, i, item); @@ -1622,11 +1622,11 @@ varobj_value_has_mutated (const 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; - struct value *new; + struct value *newobj; VEC (varobj_update_result) *stack = NULL; VEC (varobj_update_result) *result = NULL; @@ -1635,7 +1635,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) @@ -1660,15 +1660,15 @@ varobj_update (struct varobj **varp, int explicit) the frame in which a local existed. We are letting the value_of_root variable dispose of the varobj if the type has changed. */ - new = value_of_root (varp, &type_changed); - if (update_type_if_necessary(*varp, new)) + newobj = value_of_root (varp, &type_changed); + if (update_type_if_necessary(*varp, newobj)) type_changed = 1; r.varobj = *varp; r.type_changed = type_changed; - if (install_new_value ((*varp), new, type_changed)) + if (install_new_value ((*varp), newobj, type_changed)) r.changed = 1; - if (new == NULL) + if (newobj == NULL) r.status = VAROBJ_NOT_IN_SCOPE; r.value_installed = 1; @@ -1703,15 +1703,15 @@ varobj_update (struct varobj **varp, int explicit) { struct type *new_type; - new = value_of_child (v->parent, v->index); - if (update_type_if_necessary(v, new)) + newobj = value_of_child (v->parent, v->index); + if (update_type_if_necessary(v, newobj)) r.type_changed = 1; - if (new) - new_type = value_type (new); + if (newobj) + new_type = value_type (newobj); else new_type = v->root->lang_ops->type_of_child (v->parent, v->index); - if (varobj_value_has_mutated (v, new, new_type)) + if (varobj_value_has_mutated (v, newobj, new_type)) { /* The children are no longer valid; delete them now. Report the fact that its type changed as well. */ @@ -1723,7 +1723,7 @@ varobj_update (struct varobj **varp, int explicit) r.type_changed = 1; } - if (install_new_value (v, new, r.type_changed)) + if (install_new_value (v, newobj, r.type_changed)) { r.changed = 1; v->updated = 0; @@ -1735,7 +1735,7 @@ varobj_update (struct varobj **varp, int explicit) if (varobj_is_dynamic_p (v)) { VEC (varobj_p) *changed = 0, *type_changed = 0, *unchanged = 0; - VEC (varobj_p) *new = 0; + VEC (varobj_p) *newobj = 0; int i, children_changed = 0; if (v->frozen) @@ -1767,14 +1767,14 @@ varobj_update (struct varobj **varp, int explicit) /* If update_dynamic_varobj_children returns 0, then we have a non-conforming pretty-printer, so we skip it. */ - if (update_dynamic_varobj_children (v, &changed, &type_changed, &new, + if (update_dynamic_varobj_children (v, &changed, &type_changed, &newobj, &unchanged, &children_changed, 1, v->from, v->to)) { - if (children_changed || new) + if (children_changed || newobj) { r.children_changed = 1; - r.new = new; + r.newobj = newobj; } /* Push in reverse order so that the first child is popped from the work stack first, and so will be |