diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-07-18 09:29:15 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-07-18 09:31:12 -0600 |
| commit | cd215b2eb74c179d936a3b28577753a08de1cf83 (patch) | |
| tree | 25e09744719908697419c3f4a159f767008f2f27 | |
| parent | 54d7dae59a2239720c848985a7d50a0a8b3319eb (diff) | |
| download | gdb-cd215b2eb74c179d936a3b28577753a08de1cf83.zip gdb-cd215b2eb74c179d936a3b28577753a08de1cf83.tar.gz gdb-cd215b2eb74c179d936a3b28577753a08de1cf83.tar.bz2 | |
Constify main_name
This patch constifies the return type of main_name. There is a
comment indicating that this wasn't possible at some point in the
past, but whatever the barrier was, it is gone now.
Tested by rebuilding.
gdb/ChangeLog
2019-07-18 Tom Tromey <tromey@adacore.com>
* symtab.c (main_name): Constify return type.
* symfile.c (set_initial_language): Update.
* symtab.h (main_name): Constify return type.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/symfile.c | 2 | ||||
| -rw-r--r-- | gdb/symtab.c | 6 | ||||
| -rw-r--r-- | gdb/symtab.h | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 175aa92..fa669da 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-07-18 Tom Tromey <tromey@adacore.com> + + * symtab.c (main_name): Constify return type. + * symfile.c (set_initial_language): Update. + * symtab.h (main_name): Constify return type. + 2019-07-17 Tom Tromey <tom@tromey.com> * tui/tui-winsource.c (tui_update_source_window) diff --git a/gdb/symfile.c b/gdb/symfile.c index d2b88fc..c70a5ce 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1706,7 +1706,7 @@ set_initial_language (void) if (lang == language_unknown) { - char *name = main_name (); + const char *name = main_name (); struct symbol *sym = lookup_symbol (name, NULL, VAR_DOMAIN, NULL).symbol; if (sym != NULL) diff --git a/gdb/symtab.c b/gdb/symtab.c index 4189899..719e5b2 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5741,8 +5741,10 @@ find_main_name (void) set_main_name ("main", language_unknown); } -char * -main_name (void) +/* See symtab.h. */ + +const char * +main_name () { struct main_info *info = get_main_info (); diff --git a/gdb/symtab.h b/gdb/symtab.h index 6780fa3..b91454c 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2041,11 +2041,8 @@ extern std::vector<symbol_search> search_symbols (const char *, extern bool treg_matches_sym_type_name (const compiled_regex &treg, const struct symbol *sym); -/* The name of the ``main'' function. - FIXME: cagney/2001-03-20: Can't make main_name() const since some - of the calling code currently assumes that the string isn't - const. */ -extern /*const */ char *main_name (void); +/* The name of the ``main'' function. */ +extern const char *main_name (); extern enum language main_language (void); /* Lookup symbol NAME from DOMAIN in MAIN_OBJFILE's global blocks. |