diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 27 |
2 files changed, 14 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac52d5d..b9a82c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2012-05-23 Doug Evans <dje@google.com> + + * gdbtypes.c (lookup_typename): Simplify. + 2012-05-23 Pedro Alves <palves@redhat.com> * arch-utils.h (default_target_signal_to_host): Delete. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 60b0839..e3db1ed 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1143,23 +1143,16 @@ lookup_typename (const struct language_defn *language, struct type *tmp; sym = lookup_symbol (name, block, VAR_DOMAIN, 0); - if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF) - { - tmp = language_lookup_primitive_type_by_name (language, gdbarch, name); - if (tmp) - { - return tmp; - } - else if (!tmp && noerr) - { - return NULL; - } - else - { - error (_("No type named %s."), name); - } - } - return (SYMBOL_TYPE (sym)); + if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF) + return SYMBOL_TYPE (sym); + + tmp = language_lookup_primitive_type_by_name (language, gdbarch, name); + if (tmp) + return tmp; + + if (noerr) + return NULL; + error (_("No type named %s."), name); } struct type * |