diff options
Diffstat (limited to 'gdb/gnu-v2-abi.c')
| -rw-r--r-- | gdb/gnu-v2-abi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c index de6f80a..e635e8f 100644 --- a/gdb/gnu-v2-abi.c +++ b/gdb/gnu-v2-abi.c @@ -194,6 +194,7 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc) CORE_ADDR vtbl; struct minimal_symbol *minsym; char *demangled_name, *p; + const char *linkage_name; struct type *btype; struct type *known_type_vptr_basetype; int known_type_vptr_fieldno; @@ -246,12 +247,12 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc) /* Try to find a symbol that is the vtable. */ minsym=lookup_minimal_symbol_by_pc(vtbl); if (minsym==NULL - || (demangled_name=SYMBOL_LINKAGE_NAME (minsym))==NULL - || !is_vtable_name (demangled_name)) + || (linkage_name=SYMBOL_LINKAGE_NAME (minsym))==NULL + || !is_vtable_name (linkage_name)) return NULL; /* If we just skip the prefix, we get screwed by namespaces. */ - demangled_name=cplus_demangle(demangled_name,DMGL_PARAMS|DMGL_ANSI); + demangled_name=cplus_demangle(linkage_name,DMGL_PARAMS|DMGL_ANSI); p = strchr (demangled_name, ' '); if (p) *p = '\0'; @@ -297,8 +298,8 @@ static int vb_match (struct type *type, int index, struct type *basetype) { struct type *fieldtype; - char *name = TYPE_FIELD_NAME (type, index); - char *field_class_name = NULL; + const char *name = TYPE_FIELD_NAME (type, index); + const char *field_class_name = NULL; if (*name != '_') return 0; |