diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/solib-svr4.c | 18 | ||||
| -rw-r--r-- | gdb/symtab.c | 11 |
4 files changed, 26 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d90fb7d..5eb88a3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2010-08-03 Doug Evans <dje@google.com> + + * breakpoint.c (bpdisp_text): Constify bpdisps. + * solib-svr4.c (solib_break_names): Constify. + (bkpt_names, main_name_list): Constify. + (match_main): Constify soname arg. + (bfd_lookup_symbol): Constify symname arg. + (enable_break): Constify bkpt_namep. + * symtab.c (search_symbols): Constify types, types2, types3, types4. + (symtab_symbol_info): Constify classnames. + 2010-08-03 Phil Muldoon <pmuldoon@redhat.com> * NEWS: Document Python value inferior function calls. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 50c4c02..c542fb1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -262,7 +262,7 @@ bpdisp_text (enum bpdisp disp) { /* NOTE: the following values are a part of MI protocol and represent values of 'disp' field returned when inferior stops at a breakpoint. */ - static char *bpdisps[] = {"del", "dstp", "dis", "keep"}; + static const char * const bpdisps[] = {"del", "dstp", "dis", "keep"}; return bpdisps[(int) disp]; } diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 1f135d4..9ad67fb 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -80,7 +80,7 @@ struct lm_info SVR4 systems will fall back to using a symbol as the "startup mapping complete" breakpoint address. */ -static char *solib_break_names[] = +static const char * const solib_break_names[] = { "r_debug_state", "_r_debug_state", @@ -92,7 +92,7 @@ static char *solib_break_names[] = NULL }; -static char *bkpt_names[] = +static const char * const bkpt_names[] = { "_start", "__start", @@ -100,7 +100,7 @@ static char *bkpt_names[] = NULL }; -static char *main_name_list[] = +static const char * const main_name_list[] = { "main_$main", NULL @@ -357,9 +357,7 @@ get_svr4_info (void) /* Local function prototypes */ -static int match_main (char *); - -static CORE_ADDR bfd_lookup_symbol (bfd *, char *); +static int match_main (const char *); /* @@ -387,7 +385,7 @@ static CORE_ADDR bfd_lookup_symbol (bfd *, char *); */ static CORE_ADDR -bfd_lookup_symbol (bfd *abfd, char *symname) +bfd_lookup_symbol (bfd *abfd, const char *symname) { long storage_needed; asymbol *sym; @@ -1253,9 +1251,9 @@ svr4_fetch_objfile_link_map (struct objfile *objfile) non-zero iff SONAME matches one of the known main executable names. */ static int -match_main (char *soname) +match_main (const char *soname) { - char **mainp; + const char * const *mainp; for (mainp = main_name_list; *mainp != NULL; mainp++) { @@ -1347,7 +1345,7 @@ static int enable_break (struct svr4_info *info, int from_tty) { struct minimal_symbol *msymbol; - char **bkpt_namep; + const char * const *bkpt_namep; asection *interp_sect; gdb_byte *interp_name; CORE_ADDR sym_addr; diff --git a/gdb/symtab.c b/gdb/symtab.c index 4acd4a1..1c05648 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2981,13 +2981,13 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[], struct minimal_symbol *msymbol; char *val; int found_misc = 0; - static enum minimal_symbol_type types[] + static const enum minimal_symbol_type types[] = {mst_data, mst_text, mst_abs, mst_unknown}; - static enum minimal_symbol_type types2[] + static const enum minimal_symbol_type types2[] = {mst_bss, mst_file_text, mst_abs, mst_unknown}; - static enum minimal_symbol_type types3[] + static const enum minimal_symbol_type types3[] = {mst_file_data, mst_solib_trampoline, mst_abs, mst_unknown}; - static enum minimal_symbol_type types4[] + static const enum minimal_symbol_type types4[] = {mst_file_bss, mst_text, mst_abs, mst_unknown}; enum minimal_symbol_type ourtype; enum minimal_symbol_type ourtype2; @@ -3293,7 +3293,8 @@ print_msymbol_info (struct minimal_symbol *msymbol) static void symtab_symbol_info (char *regexp, domain_enum kind, int from_tty) { - static char *classnames[] = {"variable", "function", "type", "method"}; + static const char * const classnames[] = + {"variable", "function", "type", "method"}; struct symbol_search *symbols; struct symbol_search *p; struct cleanup *old_chain; |