From 9a2b4c1ba76f3dff85f08faff0dd08849c2905fb Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Thu, 6 Jan 2011 00:57:05 +0000 Subject: 2011-01-05 Michael Snyder * cli/cli-cmds.c: Shorten lines of >= 80 columns. * cli/cli-decode.c: Ditto. * cli/cli-dump.c: Ditto. * cli/cli-logging.c: Ditto. * cli/cli-script.c: Ditto. * cli/cli-setshow.c: Ditto. * common/signals.c: Ditto. * mi/mi-cmd-break.c: Ditto. * mi/mi-cmd-disas.c: Ditto. * mi/mi-cmd-stack.c: Ditto. * mi/mi-cmd-var.c: Ditto. * mi/mi-cmds.c: Ditto. * mi/mi-common.h: Ditto. * mi/mi-console.c: Ditto. * mi/mi-interp.c: Ditto. * mi/mi-main.c: Ditto. * osf-share/cma_attr.c: Ditto. * osf-share/cma_deb_core.h: Ditto. * osf-share/cma_debug_client.h: Ditto. * osf-share/cma_handle.h: Ditto. * osf-share/cma_mutex.h: Ditto. * osf-share/cma_stack_int.h: Ditto. * osf-share/cma_tcb_defs.h: Ditto. * python/py-auto-load.c: Ditto. * python/py-breakpoint.c: Ditto. * python/py-cmd.c: Ditto. * python/py-frame.c: Ditto. * python/py-objfile.c: Ditto. * python/py-param.c: Ditto. * python/py-progspace.c: Ditto. * python/py-symbol.c: Ditto. * python/py-value.c: Ditto. * python/python-internal.h: Ditto. * python/python.c: Ditto. * tui/tui-data.c: Ditto. * tui/tui-disasm.c: Ditto. * tui/tui-hooks.c: Ditto. * tui/tui-io.c: Ditto. * tui/tui-layout.c: Ditto. * tui/tui-regs.c: Ditto. * tui/tui-source.c: Ditto. * tui/tui-stack.c: Ditto. * tui/tui-win.c: Ditto. * tui/tui-windata.c: Ditto. * tui/tui-winsource.c: Ditto. --- gdb/tui/tui-data.c | 15 ++++++++++----- gdb/tui/tui-disasm.c | 16 ++++++++++------ gdb/tui/tui-hooks.c | 6 ++++-- gdb/tui/tui-io.c | 6 ++++-- gdb/tui/tui-layout.c | 10 ++++++---- gdb/tui/tui-regs.c | 21 +++++++++++++-------- gdb/tui/tui-source.c | 32 ++++++++++++++++++++------------ gdb/tui/tui-stack.c | 23 +++++++++++++++-------- gdb/tui/tui-win.c | 34 +++++++++++++++++++++------------- gdb/tui/tui-windata.c | 5 +++-- gdb/tui/tui-winsource.c | 34 ++++++++++++++++++++++------------ 11 files changed, 128 insertions(+), 74 deletions(-) (limited to 'gdb/tui') diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 588421a..e8c7cef 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -503,7 +503,8 @@ init_content_element (struct tui_win_element *element, case DATA_WIN: tui_init_generic_part (&element->which_element.data_window); element->which_element.data_window.type = DATA_ITEM_WIN; - ((struct tui_gen_win_info *) & element->which_element.data_window)->content = + ((struct tui_gen_win_info *) + &element->which_element.data_window)->content = (void **) tui_alloc_content (1, DATA_ITEM_WIN); ((struct tui_gen_win_info *) & element->which_element.data_window)->content_size = 1; @@ -544,7 +545,8 @@ init_win_info (struct tui_win_info *win_info) { case SRC_WIN: case DISASSEM_WIN: - win_info->detail.source_info.execution_info = (struct tui_gen_win_info *) NULL; + win_info->detail.source_info.execution_info + = (struct tui_gen_win_info *) NULL; win_info->detail.source_info.has_locator = FALSE; win_info->detail.source_info.horizontal_offset = 0; win_info->detail.source_info.gdbarch = NULL; @@ -646,7 +648,8 @@ tui_add_content_elements (struct tui_gen_win_info *win_info, if (win_info->content == NULL) { - win_info->content = (void **) tui_alloc_content (num_elements, win_info->type); + win_info->content = (void **) tui_alloc_content (num_elements, + win_info->type); index_start = 0; } else @@ -831,7 +834,8 @@ tui_del_data_windows (tui_win_content content, element. */ for (i = 0; i < content_size; i++) { - struct tui_gen_win_info *generic_win = &content[i]->which_element.data_window; + struct tui_gen_win_info *generic_win + = &content[i]->which_element.data_window; if (generic_win != (struct tui_gen_win_info *) NULL) { @@ -854,7 +858,8 @@ tui_free_data_content (tui_win_content content, element. */ for (i = 0; i < content_size; i++) { - struct tui_gen_win_info *generic_win = &content[i]->which_element.data_window; + struct tui_gen_win_info *generic_win + = &content[i]->which_element.data_window; if (generic_win != (struct tui_gen_win_info *) NULL) { diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index a5276f1..1d49e2e 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -193,8 +193,8 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc) TUI_DISASM_WIN->detail.source_info.gdbarch = gdbarch; TUI_DISASM_WIN->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; TUI_DISASM_WIN->detail.source_info.start_line_or_addr.u.addr = pc; - cur_pc = (CORE_ADDR) - (((struct tui_win_element *) locator->content[0])->which_element.locator.addr); + cur_pc = (CORE_ADDR) (((struct tui_win_element *) + locator->content[0])->which_element.locator.addr); max_lines = TUI_DISASM_WIN->generic.height - 2; /* Account for hilite. */ @@ -262,7 +262,8 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc) /* See whether there is a breakpoint installed. */ src->has_break = (!src->is_exec_point - && breakpoint_here_p (current_program_space->aspace, pc) + && breakpoint_here_p (current_program_space->aspace, + pc) != no_breakpoint_here); xfree (asm_lines[i].addr_string); @@ -336,7 +337,8 @@ tui_get_begin_asm_address (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p) CORE_ADDR addr; locator = tui_locator_win_info_ptr (); - element = &((struct tui_win_element *) locator->content[0])->which_element.locator; + element = &((struct tui_win_element *) + locator->content[0])->which_element.locator; if (element->addr == 0) { @@ -400,10 +402,12 @@ tui_vertical_disassem_scroll (enum tui_scroll_direction scroll_direction, pc = content[0]->which_element.source.line_or_addr.u.addr; num_to_scroll++; - dir = (scroll_direction == FORWARD_SCROLL) ? num_to_scroll : -num_to_scroll; + dir = (scroll_direction == FORWARD_SCROLL) + ? num_to_scroll : -num_to_scroll; val.loa = LOA_ADDRESS; val.u.addr = tui_find_disassembly_address (gdbarch, pc, dir); - tui_update_source_window_as_is (TUI_DISASM_WIN, gdbarch, NULL, val, FALSE); + tui_update_source_window_as_is (TUI_DISASM_WIN, gdbarch, + NULL, val, FALSE); } } diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index c9c5ee4..e132b5a 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -254,8 +254,10 @@ void tui_install_hooks (void) { deprecated_target_wait_hook = tui_target_wait_hook; - deprecated_selected_frame_level_changed_hook = tui_selected_frame_level_changed_hook; - deprecated_print_frame_info_listing_hook = tui_print_frame_info_listing_hook; + deprecated_selected_frame_level_changed_hook + = tui_selected_frame_level_changed_hook; + deprecated_print_frame_info_listing_hook + = tui_print_frame_info_listing_hook; deprecated_query_hook = tui_query_hook; diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index ef454e0..5b110bd 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -186,7 +186,8 @@ tui_puts (const char *string) } getyx (w, TUI_CMD_WIN->detail.command_info.cur_line, TUI_CMD_WIN->detail.command_info.curch); - TUI_CMD_WIN->detail.command_info.start_line = TUI_CMD_WIN->detail.command_info.cur_line; + TUI_CMD_WIN->detail.command_info.start_line + = TUI_CMD_WIN->detail.command_info.cur_line; /* We could defer the following. */ wrefresh (w); @@ -328,7 +329,8 @@ printable_part (char *pathname) { char *temp; - temp = rl_filename_completion_desired ? strrchr (pathname, '/') : (char *)NULL; + temp = rl_filename_completion_desired + ? strrchr (pathname, '/') : (char *)NULL; #if defined (__MSDOS__) if (rl_filename_completion_desired && temp == 0 && isalpha (pathname[0]) diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 919d7bf..5bfce76 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -468,8 +468,10 @@ tui_set_layout_for_display_command (const char *layout_name) up this code. - edie epstein */ if (subset_compare (buf_ptr, TUI_FLOAT_REGS_NAME)) { - if (TUI_DATA_WIN->detail.data_display_info.regs_display_type != TUI_SFLOAT_REGS - && TUI_DATA_WIN->detail.data_display_info.regs_display_type != TUI_DFLOAT_REGS) + if (TUI_DATA_WIN->detail.data_display_info.regs_display_type + != TUI_SFLOAT_REGS + && TUI_DATA_WIN->detail.data_display_info.regs_display_type + != TUI_DFLOAT_REGS) dpy_type = TUI_SFLOAT_REGS; else dpy_type = @@ -484,8 +486,8 @@ tui_set_layout_for_display_command (const char *layout_name) dpy_type = TUI_SPECIAL_REGS; else if (TUI_DATA_WIN) { - if (TUI_DATA_WIN->detail.data_display_info.regs_display_type != - TUI_UNDEFINED_REGS) + if (TUI_DATA_WIN->detail.data_display_info.regs_display_type + != TUI_UNDEFINED_REGS) dpy_type = TUI_DATA_WIN->detail.data_display_info.regs_display_type; else diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index d3aef25..fb70e9d 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -282,8 +282,8 @@ tui_show_register_group (struct reggroup *group, data_item_win = &display_info->regs_content[pos]->which_element.data_window; - data = - &((struct tui_win_element *) data_item_win->content[0])->which_element.data; + data = &((struct tui_win_element *) + data_item_win->content[0])->which_element.data; if (data) { if (!refresh_values_only) @@ -331,7 +331,8 @@ tui_display_registers_from (int start_element_no) char *p; int len; - data_item_win = &display_info->regs_content[i]->which_element.data_window; + data_item_win + = &display_info->regs_content[i]->which_element.data_window; data = &((struct tui_win_element *) data_item_win->content[0])->which_element.data; len = 0; @@ -376,7 +377,7 @@ tui_display_registers_from (int start_element_no) data_item_win = &display_info->regs_content[i] ->which_element.data_window; data_element_ptr = &((struct tui_win_element *) - data_item_win->content[0])->which_element.data; + data_item_win->content[0])->which_element.data; if (data_item_win->handle != (WINDOW*) NULL && (data_item_win->height != 1 || data_item_win->width != item_win_width @@ -417,7 +418,8 @@ static void tui_display_reg_element_at_line (int start_element_no, int start_line_no) { - if (TUI_DATA_WIN->detail.data_display_info.regs_content != (tui_win_content) NULL + if (TUI_DATA_WIN->detail.data_display_info.regs_content + != (tui_win_content) NULL && TUI_DATA_WIN->detail.data_display_info.regs_content_count > 0) { int element_no = start_element_no; @@ -427,7 +429,8 @@ tui_display_reg_element_at_line (int start_element_no, int last_line_no, first_line_on_last_page; last_line_no = tui_last_regs_line_no (); - first_line_on_last_page = last_line_no - (TUI_DATA_WIN->generic.height - 2); + first_line_on_last_page + = last_line_no - (TUI_DATA_WIN->generic.height - 2); if (first_line_on_last_page < 0) first_line_on_last_page = 0; @@ -437,7 +440,8 @@ tui_display_reg_element_at_line (int start_element_no, display at. */ if (TUI_DATA_WIN->detail.data_display_info.data_content_count <= 0 && start_line_no > first_line_on_last_page) - element_no = tui_first_reg_element_no_inline (first_line_on_last_page); + element_no + = tui_first_reg_element_no_inline (first_line_on_last_page); } tui_display_registers_from (element_no); } @@ -475,7 +479,8 @@ tui_display_registers_from_line (int line_no, line = line_no; element_no = tui_first_reg_element_no_inline (line); - if (element_no < TUI_DATA_WIN->detail.data_display_info.regs_content_count) + if (element_no + < TUI_DATA_WIN->detail.data_display_info.regs_content_count) tui_display_reg_element_at_line (element_no, line); else line = (-1); diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 53ae0b2..a46797c 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -90,8 +90,10 @@ tui_set_source_content (struct symtab *s, else { int offset, cur_line_no, cur_line, cur_len, threshold; - struct tui_gen_win_info *locator = tui_locator_win_info_ptr (); - struct tui_source_info *src = &TUI_SRC_WIN->detail.source_info; + struct tui_gen_win_info *locator + = tui_locator_win_info_ptr (); + struct tui_source_info *src + = &TUI_SRC_WIN->detail.source_info; if (TUI_SRC_WIN->generic.title) xfree (TUI_SRC_WIN->generic.title); @@ -116,7 +118,8 @@ tui_set_source_content (struct symtab *s, (threshold + 1) * sizeof (char)); while (cur_line < nlines) { - struct tui_win_element *element = (struct tui_win_element *) + struct tui_win_element *element + = (struct tui_win_element *) TUI_SRC_WIN->generic.content[cur_line]; /* Get the first character in the line. */ @@ -129,8 +132,8 @@ tui_set_source_content (struct symtab *s, /* Init the line with the line number. */ sprintf (src_line, "%-6d", cur_line_no); cur_len = strlen (src_line); - i = cur_len - - ((cur_len / tui_default_tab_len ()) * tui_default_tab_len ()); + i = cur_len - ((cur_len / tui_default_tab_len ()) + * tui_default_tab_len ()); while (i < tui_default_tab_len ()) { src_line[cur_len] = ' '; @@ -177,9 +180,11 @@ tui_set_source_content (struct symtab *s, overwrite our buffer. */ if (c == '\t') { - int j, max_tab_len = tui_default_tab_len (); + int j, max_tab_len + = tui_default_tab_len (); - for (j = i - ((i / max_tab_len) * max_tab_len); + for (j = i - ((i / max_tab_len) + * max_tab_len); j < max_tab_len && i < threshold; i++, j++) @@ -214,8 +219,8 @@ tui_set_source_content (struct symtab *s, /* Now copy the line taking the offset into account. */ if (strlen (src_line) > offset) - strcpy (((struct tui_win_element *) TUI_SRC_WIN->generic.content[ - cur_line])->which_element.source.line, + strcpy (((struct tui_win_element *) + TUI_SRC_WIN->generic.content[cur_line])->which_element.source.line, &src_line[offset]); else ((struct tui_win_element *) @@ -330,8 +335,10 @@ int tui_source_is_displayed (char *fname) { return (TUI_SRC_WIN->generic.content_in_use - && (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())-> - content[0])->which_element.locator.file_name, fname) == 0)); + && (strcmp (((struct tui_win_element *) + (tui_locator_win_info_ptr ())-> + content[0])->which_element.locator.file_name, + fname) == 0)); } @@ -360,7 +367,8 @@ tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction, if (l.u.line_no > s->nlines) /* line = s->nlines - win_info->generic.content_size + 1; */ /* elz: fix for dts 23398. */ - l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no; + l.u.line_no + = content[0]->which_element.source.line_or_addr.u.line_no; } else { diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index a842aa6..d7b9716 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -286,7 +286,8 @@ tui_set_locator_filename (const char *filename) return; } - element = &((struct tui_win_element *) locator->content[0])->which_element.locator; + element = &((struct tui_win_element *) + locator->content[0])->which_element.locator; element->file_name[0] = 0; strcat_to_buf (element->file_name, MAX_LOCATOR_ELEMENT_LEN, filename); } @@ -309,7 +310,8 @@ tui_set_locator_info (struct gdbarch *gdbarch, locator->content_size = 1; } - element = &((struct tui_win_element *) locator->content[0])->which_element.locator; + element = &((struct tui_win_element *) + locator->content[0])->which_element.locator; element->proc_name[0] = (char) 0; strcat_to_buf (element->proc_name, MAX_LOCATOR_ELEMENT_LEN, procname); element->line_no = lineno; @@ -358,7 +360,8 @@ tui_show_frame_info (struct frame_info *fi) win_info = (tui_source_windows ())->list[i]; - item = &((struct tui_win_element *) locator->content[0])->which_element; + item = &((struct tui_win_element *) + locator->content[0])->which_element; if (win_info == TUI_SRC_WIN) { start_line = (item->locator.line_no - @@ -370,7 +373,8 @@ tui_show_frame_info (struct frame_info *fi) { if (find_pc_partial_function (get_frame_pc (fi), (char **) NULL, &low, (CORE_ADDR) 0) == 0) - error (_("No function contains program counter for selected frame.")); + error (_("No function contains program " + "counter for selected frame.")); else low = tui_get_low_disassembly_address (get_frame_arch (fi), low, get_frame_pc (fi)); @@ -383,7 +387,8 @@ tui_show_frame_info (struct frame_info *fi) l.loa = LOA_LINE; l.u.line_no = start_line; if (!(source_already_displayed - && tui_line_is_displayed (item->locator.line_no, win_info, TRUE))) + && tui_line_is_displayed (item->locator.line_no, + win_info, TRUE))) tui_update_source_window (win_info, get_frame_arch (fi), sal.symtab, l, TRUE); else @@ -400,7 +405,8 @@ tui_show_frame_info (struct frame_info *fi) a.loa = LOA_ADDRESS; a.u.addr = low; - if (!tui_addr_is_displayed (item->locator.addr, win_info, TRUE)) + if (!tui_addr_is_displayed (item->locator.addr, + win_info, TRUE)) tui_update_source_window (win_info, get_frame_arch (fi), sal.symtab, a, TRUE); else @@ -435,8 +441,9 @@ extern initialize_file_ftype _initialize_tui_stack; void _initialize_tui_stack (void) { - add_com ("update", class_tui, tui_update_command, _("\ -Update the source window and locator to display the current execution point.\n")); + add_com ("update", class_tui, tui_update_command, + _("Update the source window and locator to " + "display the current execution point.\n")); } /* Command to update the display with the current execution point. */ diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 8acc48c..5cc5c4f 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -562,7 +562,8 @@ tui_scroll_left (struct tui_win_info *win_to_scroll, window do nothing since the term should handle it. */ if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN) - tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, _num_to_scroll); + tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, + _num_to_scroll); } } @@ -584,7 +585,8 @@ tui_scroll_right (struct tui_win_info *win_to_scroll, window do nothing since the term should handle it. */ if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN) - tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, _num_to_scroll); + tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, + _num_to_scroll); } } @@ -735,7 +737,8 @@ tui_resize_all (void) { first_win = TUI_DATA_WIN; first_win->generic.width += width_diff; - second_win = (struct tui_win_info *) (tui_source_windows ())->list[0]; + second_win = (struct tui_win_info *) + (tui_source_windows ())->list[0]; second_win->generic.width += width_diff; } /* Change the first window's height/width. */ @@ -777,8 +780,9 @@ tui_resize_all (void) /* Change the command window's height/width. */ TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1; - make_invisible_and_set_new_height ( - TUI_CMD_WIN, TUI_CMD_WIN->generic.height + cmd_split_diff); + make_invisible_and_set_new_height (TUI_CMD_WIN, + TUI_CMD_WIN->generic.height + + cmd_split_diff); make_visible_with_new_height (first_win); make_visible_with_new_height (second_win); make_visible_with_new_height (TUI_CMD_WIN); @@ -935,7 +939,8 @@ The window name specified must be valid and visible.\n")); tui_refresh_data_win (); xfree (buf_ptr); printf_filtered (_("Focus set to %s window.\n"), - tui_win_name ((struct tui_gen_win_info *) tui_win_with_focus ())); + tui_win_name ((struct tui_gen_win_info *) + tui_win_with_focus ())); } else warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE); @@ -1228,8 +1233,9 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, first_win, first_win->generic.height + first_split_diff); second_win->generic.origin.y = first_win->generic.height - 1; - make_invisible_and_set_new_height ( - second_win, second_win->generic.height + second_split_diff); + make_invisible_and_set_new_height (second_win, + second_win->generic.height + + second_split_diff); TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1; make_invisible_and_set_new_height (TUI_CMD_WIN, new_height); } @@ -1267,8 +1273,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, if ((TUI_CMD_WIN->generic.height + diff) < 1) make_invisible_and_set_new_height (TUI_CMD_WIN, 1); else - make_invisible_and_set_new_height ( - TUI_CMD_WIN, TUI_CMD_WIN->generic.height + diff); + make_invisible_and_set_new_height (TUI_CMD_WIN, + TUI_CMD_WIN->generic.height + diff); } make_visible_with_new_height (TUI_CMD_WIN); make_visible_with_new_height (second_win); @@ -1331,8 +1337,9 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info, /* Delete all data item windows. */ for (i = 0; i < win_info->generic.content_size; i++) { - gen_win_info = (struct tui_gen_win_info *) & ((struct tui_win_element *) - win_info->generic.content[i])->which_element.data_window; + gen_win_info = (struct tui_gen_win_info *) + &((struct tui_win_element *) + win_info->generic.content[i])->which_element.data_window; tui_delete_win (gen_win_info->handle); gen_win_info->handle = (WINDOW *) NULL; } @@ -1374,7 +1381,8 @@ make_visible_with_new_height (struct tui_win_info *win_info) else if (deprecated_safe_get_selected_frame () != NULL) { struct tui_line_or_address line; - struct symtab_and_line cursal = get_current_source_symtab_and_line (); + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); struct frame_info *frame = deprecated_safe_get_selected_frame (); struct gdbarch *gdbarch = get_frame_arch (frame); diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 2ddc8cf..84a31e0 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -251,7 +251,7 @@ tui_check_data_values (struct frame_info *frame) data_item_ptr = &TUI_DATA_WIN->detail.data_display_info. data_content[i]->which_element.data_window; data_element_ptr = &((tui_win_content) - data_item_win_ptr->content)[0]->which_element.data; + data_item_win_ptr->content)[0]->which_element.data; if value has changed (data_element_ptr, frame, &new_value) { @@ -273,7 +273,8 @@ tui_vertical_data_scroll (enum tui_scroll_direction scroll_direction, int first_line = (-1); first_element_no = tui_first_data_item_displayed (); - if (first_element_no < TUI_DATA_WIN->detail.data_display_info.regs_content_count) + if (first_element_no + < TUI_DATA_WIN->detail.data_display_info.regs_content_count) first_line = tui_line_from_reg_element_no (first_element_no); else { /* Calculate the first line from the element number which is in diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 52ba346..8b77836 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -328,7 +328,8 @@ tui_horizontal_source_scroll (struct tui_win_info *win_info, if (win_info->generic.type == SRC_WIN) { - struct symtab_and_line cursal = get_current_source_symtab_and_line (); + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); if (cursal.symtab == NULL) s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); @@ -337,11 +338,12 @@ tui_horizontal_source_scroll (struct tui_win_info *win_info, } if (direction == LEFT_SCROLL) - offset = win_info->detail.source_info.horizontal_offset + num_to_scroll; + offset = win_info->detail.source_info.horizontal_offset + + num_to_scroll; else { - if ((offset = - win_info->detail.source_info.horizontal_offset - num_to_scroll) < 0) + if ((offset = win_info->detail.source_info.horizontal_offset + - num_to_scroll) < 0) offset = 0; } win_info->detail.source_info.horizontal_offset = offset; @@ -436,7 +438,8 @@ tui_update_breakpoint_info (struct tui_win_info *win, int mode; struct tui_source_element *line; - line = &((struct tui_win_element *) win->generic.content[i])->which_element.source; + line = &((struct tui_win_element *) + win->generic.content[i])->which_element.source; if (current_only && !line->is_exec_point) continue; @@ -490,9 +493,11 @@ tui_set_exec_info_content (struct tui_win_info *win_info) { enum tui_status ret = TUI_SUCCESS; - if (win_info->detail.source_info.execution_info != (struct tui_gen_win_info *) NULL) + if (win_info->detail.source_info.execution_info + != (struct tui_gen_win_info *) NULL) { - struct tui_gen_win_info *exec_info_ptr = win_info->detail.source_info.execution_info; + struct tui_gen_win_info *exec_info_ptr + = win_info->detail.source_info.execution_info; if (exec_info_ptr->content == NULL) exec_info_ptr->content = @@ -510,7 +515,8 @@ tui_set_exec_info_content (struct tui_win_info *win_info) int mode; element = (struct tui_win_element *) exec_info_ptr->content[i]; - src_element = (struct tui_win_element *) win_info->generic.content[i]; + src_element = (struct tui_win_element *) + win_info->generic.content[i]; memset(element->which_element.simple_string, ' ', sizeof(element->which_element.simple_string)); @@ -547,7 +553,8 @@ tui_set_exec_info_content (struct tui_win_info *win_info) void tui_show_exec_info_content (struct tui_win_info *win_info) { - struct tui_gen_win_info *exec_info = win_info->detail.source_info.execution_info; + struct tui_gen_win_info *exec_info + = win_info->detail.source_info.execution_info; int cur_line; werase (exec_info->handle); @@ -566,7 +573,8 @@ tui_show_exec_info_content (struct tui_win_info *win_info) void tui_erase_exec_info_content (struct tui_win_info *win_info) { - struct tui_gen_win_info *exec_info = win_info->detail.source_info.execution_info; + struct tui_gen_win_info *exec_info + = win_info->detail.source_info.execution_info; werase (exec_info->handle); tui_refresh_win (exec_info); @@ -608,7 +616,8 @@ tui_alloc_source_buffer (struct tui_win_info *win_info) xmalloc ((max_lines * line_width) * sizeof (char)); if (src_line_buf == (char *) NULL) { - fputs_unfiltered ("Unable to Allocate Memory for Source or Disassembly Display.\n", + fputs_unfiltered ("Unable to Allocate Memory for " + "Source or Disassembly Display.\n", gdb_stderr); return TUI_FAILURE; } @@ -617,7 +626,8 @@ tui_alloc_source_buffer (struct tui_win_info *win_info) (void **) tui_alloc_content (max_lines, SRC_WIN)) == NULL) { xfree (src_line_buf); - fputs_unfiltered ("Unable to Allocate Memory for Source or Disassembly Display.\n", + fputs_unfiltered ("Unable to Allocate Memory for " + "Source or Disassembly Display.\n", gdb_stderr); return TUI_FAILURE; } -- cgit v1.1