diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-04-19 07:41:44 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-04-22 06:58:42 -0600 |
| commit | 8095d37f71c20dd9e6cb90d4f42fb868867263ed (patch) | |
| tree | 800957a7af3fd8154a3e341ff54f0411405b5cf9 /gdb/coff-pe-read.c | |
| parent | 0f34437ba0f5acab1fcb05630d88057402abbfeb (diff) | |
| download | gdb-8095d37f71c20dd9e6cb90d4f42fb868867263ed.zip gdb-8095d37f71c20dd9e6cb90d4f42fb868867263ed.tar.gz gdb-8095d37f71c20dd9e6cb90d4f42fb868867263ed.tar.bz2 | |
More const use and alloca avoidance in coff-pe-read.c
This changes another function in coff-pe-read.c to use 'const' more,
and to avoid the use of alloca by instead using std::string.
Diffstat (limited to 'gdb/coff-pe-read.c')
| -rw-r--r-- | gdb/coff-pe-read.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 5bf0e2d..d533a96 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -525,20 +525,20 @@ read_pe_exported_syms (minimal_symbol_reader &reader, /* First handle forward cases. */ if (func_rva >= export_rva && func_rva < export_rva + export_size) { - char *forward_name = (char *) (erva + func_rva); - char *funcname = (char *) (erva + name_rva); - char *forward_dll_name = forward_name; - char *forward_func_name = forward_name; - char *sep = strrchr (forward_name, '.'); - - if (sep) + const char *forward_name = (const char *) (erva + func_rva); + const char *funcname = (const char *) (erva + name_rva); + const char *forward_dll_name = forward_name; + const char *forward_func_name = forward_name; + const char *sep = strrchr (forward_name, '.'); + + std::string name_storage; + if (sep != nullptr) { int len = (int) (sep - forward_name); - forward_dll_name = (char *) alloca (len + 1); - strncpy (forward_dll_name, forward_name, len); - forward_dll_name[len] = '\0'; - forward_func_name = ++sep; + name_storage = std::string (forward_name, len); + forward_dll_name = name_storage.c_str (); + forward_func_name = sep + 1; } if (add_pe_forwarded_sym (reader, funcname, forward_dll_name, forward_func_name, ordinal, @@ -552,7 +552,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, if ((func_rva >= section_data[sectix].rva_start) && (func_rva < section_data[sectix].rva_end)) { - char *sym_name = (char *) (erva + name_rva); + const char *sym_name = (const char *) (erva + name_rva); section_found = 1; add_pe_exported_sym (reader, sym_name, func_rva, ordinal, @@ -563,7 +563,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, } if (!section_found) { - char *funcname = (char *) (erva + name_rva); + const char *funcname = (const char *) (erva + name_rva); if (name_rva == 0) { |