aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-file.c20
-rw-r--r--gdb/tui/tui-layout.c110
-rw-r--r--gdb/tui/tui-out.c8
3 files changed, 75 insertions, 63 deletions
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 1aa0a61..cf853b8 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -71,7 +71,7 @@ tui_file_new (void)
static void
tui_file_delete (struct ui_file *file)
{
- struct tui_stream *tmpstream = ui_file_data (file);
+ struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
if (tmpstream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
@@ -88,7 +88,7 @@ struct ui_file *
tui_fileopen (FILE *stream)
{
struct ui_file *file = tui_file_new ();
- struct tui_stream *tmpstream = ui_file_data (file);
+ struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
tmpstream->ts_streamtype = afile;
tmpstream->ts_filestream = stream;
@@ -101,7 +101,7 @@ struct ui_file *
tui_sfileopen (int n)
{
struct ui_file *file = tui_file_new ();
- struct tui_stream *tmpstream = ui_file_data (file);
+ struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
tmpstream->ts_streamtype = astring;
tmpstream->ts_filestream = NULL;
@@ -121,7 +121,7 @@ tui_sfileopen (int n)
static int
tui_file_isatty (struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
@@ -135,7 +135,7 @@ tui_file_isatty (struct ui_file *file)
static void
tui_file_rewind (struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
@@ -148,7 +148,7 @@ tui_file_put (struct ui_file *file,
ui_file_put_method_ftype *write,
void *dest)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
@@ -169,7 +169,7 @@ tui_file_put (struct ui_file *file,
void
tui_file_fputs (const char *linebuffer, struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_streamtype == astring)
{
@@ -189,7 +189,7 @@ tui_file_fputs (const char *linebuffer, struct ui_file *file)
char *
tui_file_get_strbuf (struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
@@ -203,7 +203,7 @@ tui_file_get_strbuf (struct ui_file *file)
void
tui_file_adjust_strbuf (int n, struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
int non_null_chars;
if (stream->ts_magic != &tui_file_magic)
@@ -233,7 +233,7 @@ tui_file_adjust_strbuf (int n, struct ui_file *file)
static void
tui_file_flush (struct ui_file *file)
{
- struct tui_stream *stream = ui_file_data (file);
+ struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
if (stream->ts_magic != &tui_file_magic)
internal_error (__FILE__, __LINE__,
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 2528296..36afba4 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -550,13 +550,14 @@ static void
make_command_window (struct tui_win_info **win_info_ptr,
int height, int origin_y)
{
- *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
+ = (struct tui_win_info *) 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;
}
@@ -590,13 +591,14 @@ static void
make_data_window (struct tui_win_info **win_info_ptr,
int height, int origin_y)
{
- *win_info_ptr = init_and_make_win (*win_info_ptr,
- DATA_WIN,
- height,
- tui_term_width (),
- 0,
- origin_y,
- BOX_WINDOW);
+ *win_info_ptr
+ = (struct tui_win_info *) init_and_make_win (*win_info_ptr,
+ DATA_WIN,
+ height,
+ tui_term_width (),
+ 0,
+ origin_y,
+ BOX_WINDOW);
}
@@ -662,13 +664,15 @@ show_source_disasm_command (void)
if (TUI_DISASM_WIN == NULL)
{
make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1);
- locator = init_and_make_win (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- (src_height + asm_height) - 1,
- DONT_BOX_WINDOW);
+ locator
+ = ((struct tui_gen_win_info *)
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ (src_height + asm_height) - 1,
+ DONT_BOX_WINDOW));
}
else
{
@@ -754,13 +758,15 @@ 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);
- locator = init_and_make_win (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- total_height - 1,
- DONT_BOX_WINDOW);
+ locator
+ = ((struct tui_gen_win_info *)
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ total_height - 1,
+ DONT_BOX_WINDOW));
}
else
{
@@ -870,22 +876,26 @@ make_source_or_disasm_window (struct tui_win_info **win_info_ptr,
execution_info = tui_source_exec_info_win_ptr ();
else
execution_info = tui_disassem_exec_info_win_ptr ();
- execution_info = init_and_make_win (execution_info,
- EXEC_INFO_WIN,
- height,
- 3,
- 0,
- origin_y,
- DONT_BOX_WINDOW);
+ execution_info
+ = ((struct tui_gen_win_info *)
+ init_and_make_win (execution_info,
+ EXEC_INFO_WIN,
+ height,
+ 3,
+ 0,
+ origin_y,
+ DONT_BOX_WINDOW));
/* Now create the source 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
+ = ((struct tui_win_info *)
+ 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;
}
@@ -918,13 +928,15 @@ 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);
- locator = init_and_make_win (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- src_height - 1,
- DONT_BOX_WINDOW);
+ locator
+ = ((struct tui_gen_win_info *)
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ src_height - 1,
+ DONT_BOX_WINDOW));
}
else
{
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 41ea349..d415a60 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -48,7 +48,7 @@ tui_field_int (struct ui_out *uiout,
const char *fldname,
int value)
{
- tui_out_data *data = ui_out_data (uiout);
+ tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
if (data->base.suppress_output)
return;
@@ -76,7 +76,7 @@ tui_field_string (struct ui_out *uiout,
const char *fldname,
const char *string)
{
- tui_out_data *data = ui_out_data (uiout);
+ tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
if (data->base.suppress_output)
return;
@@ -107,7 +107,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
const char *format,
va_list args)
{
- tui_out_data *data = ui_out_data (uiout);
+ tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
if (data->base.suppress_output)
return;
@@ -122,7 +122,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
static void
tui_text (struct ui_out *uiout, const char *string)
{
- tui_out_data *data = ui_out_data (uiout);
+ tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
if (data->base.suppress_output)
return;
generated by cgit v1.1 at 2024-08-17 09:26:09 +0000