diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-04-02 11:39:55 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-04-02 11:39:55 -0400 |
| commit | 9984dd9994c3d71fd28f41c50cdece48d6be13a6 (patch) | |
| tree | c1558384491c1187e4e664f061cdeb0f89517891 | |
| parent | 4a4f97c129b26445ff14d0e5323feeb80610a539 (diff) | |
| download | gdb-9984dd9994c3d71fd28f41c50cdece48d6be13a6.zip gdb-9984dd9994c3d71fd28f41c50cdece48d6be13a6.tar.gz gdb-9984dd9994c3d71fd28f41c50cdece48d6be13a6.tar.bz2 | |
gdb: use std::string in partial_symtab::partial_symtab / allocate_symtab
This simplifies the code a bit.
gdb/ChangeLog:
* psymtab.c (partial_symtab::partial_symtab): Change
last_objfile_name to be an std::string.
* symfile.c (allocate_symtab): Likewise.
Change-Id: I3dfe217233ed9346c2abc04a9b1be0df69a90af8
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/psymtab.c | 11 | ||||
| -rw-r--r-- | gdb/symfile.c | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac64f5c..6d61a2c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2021-04-02 Simon Marchi <simon.marchi@polymtl.ca> + * psymtab.c (partial_symtab::partial_symtab): Change + last_objfile_name to be an std::string. + * symfile.c (allocate_symtab): Likewise. + +2021-04-02 Simon Marchi <simon.marchi@polymtl.ca> + * objfiles.h (struct objfile_per_bfd_storage) <intern>: New methods. (struct objfile) <intern>: Use diff --git a/gdb/psymtab.c b/gdb/psymtab.c index b51881d..26ea35e 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1574,16 +1574,15 @@ partial_symtab::partial_symtab (const char *filename_, { /* Be a bit clever with debugging messages, and don't print objfile every time, only when it changes. */ - static char *last_objfile_name = NULL; + static std::string last_objfile_name; + const char *this_objfile_name = objfile_name (objfile); - if (last_objfile_name == NULL - || strcmp (last_objfile_name, objfile_name (objfile)) != 0) + if (last_objfile_name.empty () || last_objfile_name != this_objfile_name) { - xfree (last_objfile_name); - last_objfile_name = xstrdup (objfile_name (objfile)); + last_objfile_name = this_objfile_name; fprintf_filtered (gdb_stdlog, "Creating one or more psymtabs for objfile %s ...\n", - last_objfile_name); + this_objfile_name); } fprintf_filtered (gdb_stdlog, "Created psymtab %s for module %s.\n", diff --git a/gdb/symfile.c b/gdb/symfile.c index b71eb19..6734511 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -2770,16 +2770,15 @@ allocate_symtab (struct compunit_symtab *cust, const char *filename) { /* Be a bit clever with debugging messages, and don't print objfile every time, only when it changes. */ - static char *last_objfile_name = NULL; + static std::string last_objfile_name; + const char *this_objfile_name = objfile_name (objfile); - if (last_objfile_name == NULL - || strcmp (last_objfile_name, objfile_name (objfile)) != 0) + if (last_objfile_name.empty () || last_objfile_name != this_objfile_name) { - xfree (last_objfile_name); - last_objfile_name = xstrdup (objfile_name (objfile)); + last_objfile_name = this_objfile_name; fprintf_filtered (gdb_stdlog, "Creating one or more symtabs for objfile %s ...\n", - last_objfile_name); + this_objfile_name); } fprintf_filtered (gdb_stdlog, "Created symtab %s for module %s.\n", |