aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi
diff options
context:
space:
mode:
authorNick Roberts <nickrob@snap.net.nz>2007-11-27 23:02:59 +0000
committerNick Roberts <nickrob@snap.net.nz>2007-11-27 23:02:59 +0000
commit9265acad39657258bc195251c91368c0ef56382d (patch)
tree9daf3ab6dd5d1705a3cf419995f9064fd520e51b /gdb/mi
parentb21a715fc17fcc12efbc1d32a1c1b5a3494f490c (diff)
downloadgdb-9265acad39657258bc195251c91368c0ef56382d.zip
gdb-9265acad39657258bc195251c91368c0ef56382d.tar.gz
gdb-9265acad39657258bc195251c91368c0ef56382d.tar.bz2
(print_varobj): Revert change from 2007-08-31.
(mi_print_value_p): Guard against type = NULL.
Diffstat (limited to 'gdb/mi')
-rw-r--r--gdb/mi/mi-cmd-var.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 26457b2..3f917f7 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -55,8 +55,7 @@ print_varobj (struct varobj *var, enum print_values print_values,
ui_out_field_string (uiout, "exp", varobj_get_expression (var));
ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
- gdb_type = varobj_get_gdb_type (var);
- if (gdb_type && mi_print_value_p (gdb_type, print_values))
+ if (mi_print_value_p (varobj_get_gdb_type (var), print_values))
ui_out_field_string (uiout, "value", varobj_get_value (var));
type = varobj_get_type (var);
@@ -327,7 +326,6 @@ Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""),
static int
mi_print_value_p (struct type *type, enum print_values print_values)
{
- type = check_typedef (type);
if (print_values == PRINT_NO_VALUES)
return 0;
@@ -335,12 +333,18 @@ mi_print_value_p (struct type *type, enum print_values print_values)
if (print_values == PRINT_ALL_VALUES)
return 1;
- /* For PRINT_SIMPLE_VALUES, only print the value if it has a type
- and that type is not a compound type. */
+ if (type == NULL)
+ return 1;
+ else
+ {
+ type = check_typedef (type);
- return (TYPE_CODE (type) != TYPE_CODE_ARRAY
- && TYPE_CODE (type) != TYPE_CODE_STRUCT
- && TYPE_CODE (type) != TYPE_CODE_UNION);
+ /* For PRINT_SIMPLE_VALUES, only print the value if it has a type
+ and that type is not a compound type. */
+ return (TYPE_CODE (type) != TYPE_CODE_ARRAY
+ && TYPE_CODE (type) != TYPE_CODE_STRUCT
+ && TYPE_CODE (type) != TYPE_CODE_UNION);
+ }
}
enum mi_cmd_result