diff options
| -rw-r--r-- | gdb/ChangeLog | 36 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 2 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/c-typeprint.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 2 | ||||
| -rw-r--r-- | gdb/i386-tdep.c | 2 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 8 | ||||
| -rw-r--r-- | gdb/m2-typeprint.c | 2 | ||||
| -rw-r--r-- | gdb/macroscope.c | 9 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-break.c | 4 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-disas.c | 2 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-env.c | 4 | ||||
| -rw-r--r-- | gdb/mi/mi-getopt.c | 2 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 4 | ||||
| -rw-r--r-- | gdb/p-typeprint.c | 2 | ||||
| -rw-r--r-- | gdb/prologue-value.h | 2 | ||||
| -rw-r--r-- | gdb/remote-fileio.c | 26 | ||||
| -rw-r--r-- | gdb/remote.c | 10 | ||||
| -rw-r--r-- | gdb/signals/signals.c | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-layout.c | 110 | ||||
| -rw-r--r-- | gdb/valprint.c | 7 | ||||
| -rw-r--r-- | gdb/varobj.c | 5 |
22 files changed, 140 insertions, 109 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd956b62d05..299c61f2dfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,41 @@ 2007-01-03 Daniel Jacobowitz <dan@codesourcery.com> + * 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. + +2007-01-03 Daniel Jacobowitz <dan@codesourcery.com> + * NEWS: Mention pointer to member improvements. * Makefile.in (gnu-v3-abi.o): Delete special rule. (eval.o, gnu-v3-abi.o, ia64-tdep.o): Update. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7de7a191520..76968d9b421 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5628,7 +5628,7 @@ find_struct_field (char *name, struct type *type, int offset, if (field_type_p != NULL) *field_type_p = NULL; if (byte_offset_p != NULL) - *byte_offset_p; + *byte_offset_p = 0; if (bit_offset_p != NULL) *bit_offset_p = 0; if (bit_size_p != NULL) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index be858e21f35..9101750c95c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -7599,7 +7599,7 @@ is valid is not currently in scope.\n"), bpt->number); int mem_cnt = can_use_hardware_watchpoint (bpt->val); /* Hack around 'unused var' error for some targets here */ - (void) mem_cnt, i; + (void) mem_cnt, (void) i; target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT ( bpt->type, i + mem_cnt, other_type_used); /* we can consider of type is bp_hardware_watchpoint, convert to diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index 518af681efb..4e1c71317a9 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -542,7 +542,7 @@ c_type_print_varspec_suffix (struct type *type, struct ui_file *stream, fprintf_filtered (stream, ")"); fprintf_filtered (stream, "["); - if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 + if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED) fprintf_filtered (stream, "%d", (TYPE_LENGTH (type) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 308e6c21a74..8c33edb9c29 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3305,7 +3305,7 @@ copy_type_recursive (struct objfile *objfile, struct type *type, can't, but at the moment it is not needed. */ if (TYPE_CODE (type) == TYPE_CODE_FLT) - TYPE_FLOATFORMAT (new_type) == TYPE_FLOATFORMAT (type); + TYPE_FLOATFORMAT (new_type) = TYPE_FLOATFORMAT (type); else if (TYPE_CODE (type) == TYPE_CODE_STRUCT || TYPE_CODE (type) == TYPE_CODE_UNION || TYPE_CODE (type) == TYPE_CODE_TEMPLATE diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 705e3f32887..cd52bf6d078 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -886,7 +886,7 @@ i386_skip_prologue (CORE_ADDR start_pc) /* addl y,%ebx */ if (delta > 0 && op == 0x81 - && read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3); + && read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3) { pc += delta + 6; } diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index c0e6dc1a51c..fedb1796304 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -2804,7 +2804,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty) if (cmdline_f || all) { sprintf (fname1, "/proc/%lld/cmdline", pid); - if ((procfile = fopen (fname1, "r")) > 0) + if ((procfile = fopen (fname1, "r")) != NULL) { fgets (buffer, sizeof (buffer), procfile); printf_filtered ("cmdline = '%s'\n", buffer); @@ -2834,7 +2834,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty) if (mappings_f || all) { sprintf (fname1, "/proc/%lld/maps", pid); - if ((procfile = fopen (fname1, "r")) > 0) + if ((procfile = fopen (fname1, "r")) != NULL) { long long addr, endaddr, size, offset, inode; char permissions[8], device[8], filename[MAXPATHLEN]; @@ -2894,7 +2894,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty) if (status_f || all) { sprintf (fname1, "/proc/%lld/status", pid); - if ((procfile = fopen (fname1, "r")) > 0) + if ((procfile = fopen (fname1, "r")) != NULL) { while (fgets (buffer, sizeof (buffer), procfile) != NULL) puts_filtered (buffer); @@ -2906,7 +2906,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty) if (stat_f || all) { sprintf (fname1, "/proc/%lld/stat", pid); - if ((procfile = fopen (fname1, "r")) > 0) + if ((procfile = fopen (fname1, "r")) != NULL) { int itmp; char ctmp; diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c index cda9189e023..1f26438b902 100644 --- a/gdb/m2-typeprint.c +++ b/gdb/m2-typeprint.c @@ -206,7 +206,7 @@ static void m2_array (struct type *type, struct ui_file *stream, int show, int level) { fprintf_filtered (stream, "ARRAY ["); - if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 + if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED) { if (TYPE_INDEX_TYPE (type) != 0) diff --git a/gdb/macroscope.c b/gdb/macroscope.c index 748ac536008..25860d4159b 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. */ diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 84318b93f86..3e0fa80d128 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc) {"c", CONDITION_OPT, 1}, {"i", IGNORE_COUNT_OPT, 1}, {"p", THREAD_OPT, 1}, - 0 + { 0, 0, 0 } }; /* Parse arguments. It could be -r or -h or -t, <location> or ``--'' @@ -196,7 +196,7 @@ mi_cmd_break_watch (char *command, char **argv, int argc) { {"r", READ_OPT, 0}, {"a", ACCESS_OPT, 0}, - 0 + { 0, 0, 0 } }; /* Parse arguments. */ diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index 7b003a6abd5..0cc67e4949b 100644 --- a/gdb/mi/mi-cmd-disas.c +++ b/gdb/mi/mi-cmd-disas.c @@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc) {"n", NUM_OPT, 1}, {"s", START_OPT, 1}, {"e", END_OPT, 1}, - 0 + { 0, 0, 0 } }; /* Get the options with their arguments. Keep track of what we diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c index 101aa3c72eb..f14051c3f7f 100644 --- a/gdb/mi/mi-cmd-env.c +++ b/gdb/mi/mi-cmd-env.c @@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **argv, int argc) static struct mi_opt opts[] = { {"r", RESET_OPT, 0}, - 0 + { 0, 0, 0 } }; dont_repeat (); @@ -198,7 +198,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc) static struct mi_opt opts[] = { {"r", RESET_OPT, 0}, - 0 + { 0, 0, 0 } }; dont_repeat (); diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c index 838a8e16640..6701e313e90 100644 --- a/gdb/mi/mi-getopt.c +++ b/gdb/mi/mi-getopt.c @@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int argc, char **argv) char *optarg; static struct mi_opt opts[] = { - 0 + { 0, 0, 0 } }; if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1) diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 98b7b6d86f5..8338931f942 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -762,7 +762,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) static struct mi_opt opts[] = { {"o", OFFSET_OPT, 1}, - 0 + { 0, 0, 0 } }; while (1) @@ -962,7 +962,7 @@ mi_cmd_data_write_memory (char *command, char **argv, int argc) static struct mi_opt opts[] = { {"o", OFFSET_OPT, 1}, - 0 + { 0, 0, 0 } }; while (1) diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c index d6f6b4ba13a..4449c91cb67 100644 --- a/gdb/p-typeprint.c +++ b/gdb/p-typeprint.c @@ -252,7 +252,7 @@ pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream, if (passed_a_ptr) fprintf_filtered (stream, "("); fprintf_filtered (stream, "array "); - if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 + if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0 && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED) fprintf_filtered (stream, "[%d..%d] ", TYPE_ARRAY_LOWER_BOUND_VALUE (type), diff --git a/gdb/prologue-value.h b/gdb/prologue-value.h index ec44cad021f..8df77b7ea1c 100644 --- a/gdb/prologue-value.h +++ b/gdb/prologue-value.h @@ -285,7 +285,7 @@ int pv_area_store_would_trash (struct pv_area *area, pv_t addr); instead, and collecting all your information in one pass. */ int pv_area_find_reg (struct pv_area *area, struct gdbarch *gdbarch, - int register, + int reg, CORE_ADDR *offset_p); diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index eb7ae382963..c698d76f69a 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -1332,19 +1332,19 @@ static struct { char *name; void (*func)(char *); } remote_fio_func_map[] = { - "open", remote_fileio_func_open, - "close", remote_fileio_func_close, - "read", remote_fileio_func_read, - "write", remote_fileio_func_write, - "lseek", remote_fileio_func_lseek, - "rename", remote_fileio_func_rename, - "unlink", remote_fileio_func_unlink, - "stat", remote_fileio_func_stat, - "fstat", remote_fileio_func_fstat, - "gettimeofday", remote_fileio_func_gettimeofday, - "isatty", remote_fileio_func_isatty, - "system", remote_fileio_func_system, - NULL, NULL + { "open", remote_fileio_func_open }, + { "close", remote_fileio_func_close }, + { "read", remote_fileio_func_read }, + { "write", remote_fileio_func_write }, + { "lseek", remote_fileio_func_lseek }, + { "rename", remote_fileio_func_rename }, + { "unlink", remote_fileio_func_unlink }, + { "stat", remote_fileio_func_stat }, + { "fstat", remote_fileio_func_fstat }, + { "gettimeofday", remote_fileio_func_gettimeofday }, + { "isatty", remote_fileio_func_isatty }, + { "system", remote_fileio_func_system }, + { NULL, NULL } }; static int diff --git a/gdb/remote.c b/gdb/remote.c index 69bc65bd16e..c46531079fe 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -996,8 +996,8 @@ static int use_threadinfo_query; static int use_threadextra_query; /* Tokens for use by the asynchronous signal handlers for SIGINT. */ -static void *sigint_remote_twice_token; -static void *sigint_remote_token; +static struct async_signal_handler *sigint_remote_twice_token; +static struct async_signal_handler *sigint_remote_token; /* These are pointers to hook functions that may be set in order to modify resume/wait behavior for a particular architecture. */ @@ -2945,11 +2945,9 @@ cleanup_sigint_signal_handler (void *dummy) { signal (SIGINT, handle_sigint); if (sigint_remote_twice_token) - delete_async_signal_handler ((struct async_signal_handler **) - &sigint_remote_twice_token); + delete_async_signal_handler (&sigint_remote_twice_token); if (sigint_remote_token) - delete_async_signal_handler ((struct async_signal_handler **) - &sigint_remote_token); + delete_async_signal_handler (&sigint_remote_token); } /* Send ^C to target to halt it. Target will respond, and send us a diff --git a/gdb/signals/signals.c b/gdb/signals/signals.c index 63eb333c487..55ededc542c 100644 --- a/gdb/signals/signals.c +++ b/gdb/signals/signals.c @@ -1,6 +1,6 @@ /* Target signal translation functions for GDB. Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc. Contributed by Cygnus Support. This file is part of GDB. @@ -219,7 +219,7 @@ static struct { char * target_signal_to_string (enum target_signal sig) { - if ((sig >= TARGET_SIGNAL_FIRST) && (sig <= TARGET_SIGNAL_LAST)) + if ((int) sig >= TARGET_SIGNAL_FIRST && (int) sig <= TARGET_SIGNAL_LAST) return signals[sig].string; else return signals[TARGET_SIGNAL_UNKNOWN].string; @@ -229,7 +229,7 @@ target_signal_to_string (enum target_signal sig) char * target_signal_to_name (enum target_signal sig) { - if ((sig >= TARGET_SIGNAL_FIRST) && (sig <= TARGET_SIGNAL_LAST) + if ((int) sig >= TARGET_SIGNAL_FIRST && (int) sig <= TARGET_SIGNAL_LAST && signals[sig].name != NULL) return signals[sig].name; else diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2690c49a4d9..37b70a1693a 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -47,7 +47,7 @@ ********************************/ static void show_layout (enum tui_layout_type); static void init_gen_win_info (struct tui_gen_win_info *, enum tui_win_type, int, int, int, int); -static void init_and_make_win (void **, enum tui_win_type, int, int, int, int, int); +static void *init_and_make_win (void *, enum tui_win_type, int, int, int, int, int); static void show_source_or_disasm_and_command (enum tui_layout_type); static void make_source_or_disasm_window (struct tui_win_info * *, enum tui_win_type, int, int); static void make_command_window (struct tui_win_info * *, int, int); @@ -640,13 +640,13 @@ prev_layout (void) static void make_command_window (struct tui_win_info * * win_info_ptr, int height, int origin_y) { - init_and_make_win ((void **) win_info_ptr, - CMD_WIN, - height, - tui_term_width (), - 0, - origin_y, - DONT_BOX_WINDOW); + *win_info_ptr = init_and_make_win (*win_info_ptr, + CMD_WIN, + height, + tui_term_width (), + 0, + origin_y, + DONT_BOX_WINDOW); (*win_info_ptr)->can_highlight = FALSE; } @@ -679,13 +679,13 @@ make_disasm_window (struct tui_win_info * * win_info_ptr, int height, int origin static void make_data_window (struct tui_win_info * * win_info_ptr, int height, int origin_y) { - init_and_make_win ((void **) win_info_ptr, - DATA_WIN, - height, - tui_term_width (), - 0, - origin_y, - BOX_WINDOW); + *win_info_ptr = init_and_make_win (*win_info_ptr, + DATA_WIN, + height, + tui_term_width (), + 0, + origin_y, + BOX_WINDOW); } @@ -751,13 +751,13 @@ show_source_disasm_command (void) if (TUI_DISASM_WIN == NULL) { make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1); - init_and_make_win ((void **) & locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - (src_height + asm_height) - 1, - DONT_BOX_WINDOW); + locator = init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + (src_height + asm_height) - 1, + DONT_BOX_WINDOW); } else { @@ -844,13 +844,13 @@ show_data (enum tui_layout_type new_layout) make_source_window (&tui_win_list[win_type], src_height, data_height - 1); else make_disasm_window (&tui_win_list[win_type], src_height, data_height - 1); - init_and_make_win ((void **) & locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - total_height - 1, - DONT_BOX_WINDOW); + locator = init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + total_height - 1, + DONT_BOX_WINDOW); } else { @@ -911,11 +911,11 @@ init_gen_win_info (struct tui_gen_win_info * win_info, enum tui_win_type type, /* ** init_and_make_win(). */ -static void -init_and_make_win (void ** win_info_ptr, enum tui_win_type win_type, - int height, int width, int origin_x, int origin_y, int box_it) +static void * +init_and_make_win (void *opaque_win_info, enum tui_win_type win_type, + int height, int width, int origin_x, int origin_y, + int box_it) { - void *opaque_win_info = *win_info_ptr; struct tui_gen_win_info * generic; if (opaque_win_info == NULL) @@ -942,7 +942,7 @@ init_and_make_win (void ** win_info_ptr, enum tui_win_type win_type, } tui_make_window (generic, box_it); } - *win_info_ptr = opaque_win_info; + return opaque_win_info; } @@ -959,23 +959,23 @@ make_source_or_disasm_window (struct tui_win_info * * win_info_ptr, enum tui_win execution_info = tui_source_exec_info_win_ptr (); else execution_info = tui_disassem_exec_info_win_ptr (); - init_and_make_win ((void **) & execution_info, - EXEC_INFO_WIN, - height, - 3, - 0, - origin_y, - DONT_BOX_WINDOW); + execution_info = init_and_make_win (execution_info, + EXEC_INFO_WIN, + height, + 3, + 0, + origin_y, + DONT_BOX_WINDOW); /* ** Now create the source window. */ - init_and_make_win ((void **) win_info_ptr, - type, - height, - tui_term_width () - execution_info->width, - execution_info->width, - origin_y, - BOX_WINDOW); + *win_info_ptr = init_and_make_win (*win_info_ptr, + type, + height, + tui_term_width () - execution_info->width, + execution_info->width, + origin_y, + BOX_WINDOW); (*win_info_ptr)->detail.source_info.execution_info = execution_info; } @@ -1009,13 +1009,13 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) make_source_window (win_info_ptr, src_height - 1, 0); else make_disasm_window (win_info_ptr, src_height - 1, 0); - init_and_make_win ((void **) & locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - src_height - 1, - DONT_BOX_WINDOW); + locator = init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + src_height - 1, + DONT_BOX_WINDOW); } else { diff --git a/gdb/valprint.c b/gdb/valprint.c index 209414d6755..b50a65304b9 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -207,13 +207,12 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, int deref_ref, int recurse, enum val_prettyprint pretty) { volatile struct gdb_exception except; + volatile enum val_prettyprint real_pretty = pretty; int ret = 0; struct type *real_type = check_typedef (type); if (pretty == Val_pretty_default) - { - pretty = prettyprint_structs ? Val_prettyprint : Val_no_prettyprint; - } + real_pretty = prettyprint_structs ? Val_prettyprint : Val_no_prettyprint; QUIT; @@ -231,7 +230,7 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, TRY_CATCH (except, RETURN_MASK_ERROR) { ret = LA_VAL_PRINT (type, valaddr, embedded_offset, address, - stream, format, deref_ref, recurse, pretty); + stream, format, deref_ref, recurse, real_pretty); } if (except.reason < 0) fprintf_filtered (stream, _("<error reading variable>")); diff --git a/gdb/varobj.c b/gdb/varobj.c index 25860cbd502..a0ddacc019c 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -326,8 +326,7 @@ struct language_specific }; /* Array of known source language routines. */ -static struct language_specific - languages[vlang_end][sizeof (struct language_specific)] = { +static struct language_specific languages[vlang_end] = { /* Unknown (try treating as C */ { vlang_unknown, @@ -518,7 +517,7 @@ varobj_create (char *objname, /* Set language info */ lang = variable_language (var); - var->root->lang = languages[lang]; + var->root->lang = &languages[lang]; /* Set ourselves as our root */ var->root->rootvar = var; |