diff options
| author | Daniel Jacobowitz <drow@false.org> | 2007-01-03 19:01:25 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2007-01-03 19:01:25 +0000 |
| commit | d5d6fca504d03e4fa016dc91935e7dbc6d1df20e (patch) | |
| tree | 1ac748c43cc1e6b0943ad54bca714619211589c9 /gdb/macroscope.c | |
| parent | d821e36b0b53e3ce0d3f485aad6f2663b7433406 (diff) | |
| download | gdb-d5d6fca504d03e4fa016dc91935e7dbc6d1df20e.zip gdb-d5d6fca504d03e4fa016dc91935e7dbc6d1df20e.tar.gz gdb-d5d6fca504d03e4fa016dc91935e7dbc6d1df20e.tar.bz2 | |
Warning fixes.
* ada-lang.c (find_struct_field): Initialize *byte_offset_p.
* breakpoint.c (do_enable_breakpoint): Ignore both mem_cnt and i.
* c-typeprint.c (c_type_print_varspec_suffix): Don't test length
greater than or equal to zero.
* m2-typeprint.c (m2_array): Likewise.
* p-typeprint.c (pascal_type_print_varspec_prefix): Likewise.
* gdbtypes.c (copy_type_recursive): Correct == typo.
* i386-tdep.c (i386_skip_prologue): Remove stray semicolon.
* linux-nat.c (linux_nat_info_proc_cmd): Don't compare a pointer
greater than zero.
* macroscope.c (sal_macro_scope): Don't name a local variable "main".
(default_macro_scope): Remove unused variable.
* prologue-value.h (pv_area_find_reg): Don't name an argument
"register".
* remote-fileio.c (remote_fio_func_map): Add missing braces.
* remote.c (sigint_remote_twice_token, sigint_remote_token): Change
type.
(cleanup_sigint_signal_handler): Remove casts.
* valprint.c (val_print): Use a volatile local for the modified
argument.
* varobj.c (languages): Remove extra array dimension.
(varobj_create): Correct access to languages array.
* mi/mi-cmd-break.c (mi_cmd_break_insert, mi_cmd_break_watch): Add
missing braces.
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise.
* mi/mi-cmd-env.c (mi_cmd_env_path, mi_cmd_env_dir): Likewise.
* mi/mi-getopt.c (mi_valid_noargs): Likewise.
* mi/mi-main.c (mi_cmd_data_read_memory): Likewise.
(mi_cmd_data_write_memory): Likewise.
* signals/signals.c (target_signal_to_string): Cast to int before
comparing.
* tui/tui-layout.c (init_and_make_win): Take and return a void *.
Update all callers.
Diffstat (limited to 'gdb/macroscope.c')
| -rw-r--r-- | gdb/macroscope.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/macroscope.c b/gdb/macroscope.c index 748ac53..25860d4 100644 --- a/gdb/macroscope.c +++ b/gdb/macroscope.c @@ -33,7 +33,7 @@ struct macro_scope * sal_macro_scope (struct symtab_and_line sal) { - struct macro_source_file *main, *inclusion; + struct macro_source_file *main_file, *inclusion; struct macro_scope *ms; if (! sal.symtab @@ -42,8 +42,8 @@ sal_macro_scope (struct symtab_and_line sal) ms = (struct macro_scope *) xmalloc (sizeof (*ms)); - main = macro_main (sal.symtab->macro_table); - inclusion = macro_lookup_inclusion (main, sal.symtab->filename); + main_file = macro_main (sal.symtab->macro_table); + inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename); if (inclusion) { @@ -66,7 +66,7 @@ sal_macro_scope (struct symtab_and_line sal) For the time being, though, we'll just treat these as occurring at the end of the main source file. */ - ms->file = main; + ms->file = main_file; ms->line = -1; complaint (&symfile_complaints, @@ -83,7 +83,6 @@ struct macro_scope * default_macro_scope (void) { struct symtab_and_line sal; - struct macro_source_file *main; struct macro_scope *ms; /* If there's a selected frame, use its PC. */ |