diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-01-21 18:03:06 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-01-21 18:03:06 +0000 |
| commit | eb1defae67a25c05311d2ddeb9c957c5a0c087ca (patch) | |
| tree | f8d1caf59d6f13bf5a7b10ef930eb7563913b51c /gdb/symtab.c | |
| parent | c599e03064b34a25391a4d6266d47b8d4565b5fb (diff) | |
| download | gdb-eb1defae67a25c05311d2ddeb9c957c5a0c087ca.tar.gz | |
* symtab.c (struct demangled_name_entry) <mangled>: Now const.
(symbol_set_names): Remove casts. Handle field const-ness.
Diffstat (limited to 'gdb/symtab.c')
| -rw-r--r-- | gdb/symtab.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c index 68d654db2c9..d40436a72b0 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -526,7 +526,7 @@ symbol_set_language (struct general_symbol_info *gsymbol, /* Objects of this type are stored in the demangled name hash table. */ struct demangled_name_entry { - char *mangled; + const char *mangled; char demangled[1]; }; @@ -758,7 +758,7 @@ symbol_set_names (struct general_symbol_info *gsymbol, linkage_name_copy = linkage_name; } - entry.mangled = (char *) lookup_name; + entry.mangled = lookup_name; slot = ((struct demangled_name_entry **) htab_find_slot (objfile->demangled_names_hash, &entry, INSERT)); @@ -789,10 +789,12 @@ symbol_set_names (struct general_symbol_info *gsymbol, offsetof (struct demangled_name_entry, demangled) + demangled_len + 1); - (*slot)->mangled = (char *) lookup_name; + (*slot)->mangled = lookup_name; } else { + char *mangled_ptr; + /* If we must copy the mangled name, put it directly after the demangled name so we can have a single allocation. */ @@ -800,8 +802,9 @@ symbol_set_names (struct general_symbol_info *gsymbol, offsetof (struct demangled_name_entry, demangled) + lookup_len + demangled_len + 2); - (*slot)->mangled = &((*slot)->demangled[demangled_len + 1]); - strcpy ((*slot)->mangled, lookup_name); + mangled_ptr = &((*slot)->demangled[demangled_len + 1]); + strcpy (mangled_ptr, lookup_name); + (*slot)->mangled = mangled_ptr; } if (demangled_name != NULL) |