diff options
Diffstat (limited to 'gdb/mi')
-rw-r--r-- | gdb/mi/mi-cmd-var.c | 2 | ||||
-rw-r--r-- | gdb/mi/mi-console.c | 14 | ||||
-rw-r--r-- | gdb/mi/mi-interp.c | 53 | ||||
-rw-r--r-- | gdb/mi/mi-main.c | 12 | ||||
-rw-r--r-- | gdb/mi/mi-out.c | 36 | ||||
-rw-r--r-- | gdb/mi/mi-parse.c | 2 |
6 files changed, 63 insertions, 56 deletions
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index ee0bbc6..e316812 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -649,7 +649,7 @@ struct mi_cmd_var_update static void mi_cmd_var_update_iter (struct varobj *var, void *data_pointer) { - struct mi_cmd_var_update *data = data_pointer; + struct mi_cmd_var_update *data = (struct mi_cmd_var_update *) data_pointer; int thread_id, thread_stopped; thread_id = varobj_get_thread_id (var); diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c index 257f452..e0947e0 100644 --- a/gdb/mi/mi-console.c +++ b/gdb/mi/mi-console.c @@ -67,7 +67,8 @@ mi_console_file_new (struct ui_file *raw, const char *prefix, char quote) static void mi_console_file_delete (struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -79,7 +80,8 @@ mi_console_file_delete (struct ui_file *file) static void mi_console_file_fputs (const char *buf, struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -97,7 +99,7 @@ mi_console_file_fputs (const char *buf, struct ui_file *file) static void mi_console_raw_packet (void *data, const char *buf, long length_buf) { - struct mi_console_file *mi_console = data; + struct mi_console_file *mi_console = (struct mi_console_file *) data; if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -126,7 +128,8 @@ mi_console_raw_packet (void *data, const char *buf, long length_buf) static void mi_console_file_flush (struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -144,7 +147,8 @@ mi_console_file_flush (struct ui_file *file) void mi_console_set_raw (struct ui_file *file, struct ui_file *raw) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 385b975..b349df2 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -173,7 +173,7 @@ mi_interpreter_init (struct interp *interp, int top_level) static int mi_interpreter_resume (void *data) { - struct mi_interp *mi = data; + struct mi_interp *mi = (struct mi_interp *) data; /* As per hack note in mi_interpreter_init, swap in the output channels... */ @@ -355,7 +355,7 @@ mi_command_loop (void *data) static void mi_new_thread (struct thread_info *t) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct inferior *inf = find_inferior_ptid (t->ptid); gdb_assert (inf); @@ -378,7 +378,7 @@ mi_thread_exit (struct thread_info *t, int silent) inf = find_inferior_ptid (t->ptid); - mi = top_level_interpreter_data (); + mi = (struct mi_interp *) top_level_interpreter_data (); old_chain = make_cleanup_restore_target_terminal (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -394,7 +394,7 @@ mi_thread_exit (struct thread_info *t, int silent) static void mi_record_changed (struct inferior *inferior, int started) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); fprintf_unfiltered (mi->event_channel, "record-%s,thread-group=\"i%d\"", started ? "started" : "stopped", inferior->num); @@ -405,7 +405,7 @@ mi_record_changed (struct inferior *inferior, int started) static void mi_inferior_added (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -417,7 +417,7 @@ mi_inferior_added (struct inferior *inf) static void mi_inferior_appeared (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -429,7 +429,7 @@ mi_inferior_appeared (struct inferior *inf) static void mi_inferior_exit (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); if (inf->has_exit_code) @@ -446,7 +446,7 @@ mi_inferior_exit (struct inferior *inf) static void mi_inferior_removed (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -484,7 +484,7 @@ mi_interp_data (void) struct interp *interp = find_mi_interpreter (); if (interp != NULL) - return interp_data (interp); + return (struct mi_interp *) interp_data (interp); return NULL; } @@ -611,7 +611,8 @@ mi_on_normal_stop (struct bpstats *bs, int print_frame) || (tp->control.command_interp != NULL && tp->control.command_interp != top_level_interpreter ())) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi + = (struct mi_interp *) top_level_interpreter_data (); print_stop_event (mi->cli_uiout); } @@ -674,7 +675,7 @@ struct mi_suppress_notification mi_suppress_notification = static void mi_traceframe_changed (int tfnum, int tpnum) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); if (mi_suppress_notification.traceframe) return; @@ -696,7 +697,7 @@ mi_traceframe_changed (int tfnum, int tpnum) static void mi_tsv_created (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); @@ -712,7 +713,7 @@ mi_tsv_created (const struct trace_state_variable *tsv) static void mi_tsv_deleted (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); @@ -730,7 +731,7 @@ mi_tsv_deleted (const struct trace_state_variable *tsv) static void mi_tsv_modified (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -756,7 +757,7 @@ mi_tsv_modified (const struct trace_state_variable *tsv) static void mi_breakpoint_created (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.breakpoint) @@ -795,7 +796,7 @@ mi_breakpoint_created (struct breakpoint *b) static void mi_breakpoint_deleted (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); if (mi_suppress_notification.breakpoint) return; @@ -816,7 +817,7 @@ mi_breakpoint_deleted (struct breakpoint *b) static void mi_breakpoint_modified (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.breakpoint) @@ -853,7 +854,7 @@ mi_breakpoint_modified (struct breakpoint *b) static int mi_output_running_pid (struct thread_info *info, void *arg) { - ptid_t *ptid = arg; + ptid_t *ptid = (ptid_t *) arg; if (ptid_get_pid (*ptid) == ptid_get_pid (info->ptid)) fprintf_unfiltered (raw_stdout, @@ -868,7 +869,7 @@ mi_inferior_count (struct inferior *inf, void *arg) { if (inf->pid != 0) { - int *count_p = arg; + int *count_p = (int *) arg; (*count_p)++; } @@ -944,7 +945,7 @@ mi_on_resume (ptid_t ptid) static void mi_solib_loaded (struct so_list *solib) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -970,7 +971,7 @@ mi_solib_loaded (struct so_list *solib) static void mi_solib_unloaded (struct so_list *solib) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -997,7 +998,7 @@ mi_solib_unloaded (struct so_list *solib) static void mi_command_param_changed (const char *param, const char *value) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.cmd_param_changed) @@ -1024,7 +1025,7 @@ static void mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr, ssize_t len, const bfd_byte *myaddr) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); struct obj_section *sec; @@ -1066,7 +1067,7 @@ report_initial_inferior (struct inferior *inf, void *closure) mi_inferior_added assumes that inferior is fully initialized and top_level_interpreter_data is set, we cannot call it here. */ - struct mi_interp *mi = closure; + struct mi_interp *mi = (struct mi_interp *) closure; target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -1079,7 +1080,7 @@ report_initial_inferior (struct inferior *inf, void *closure) static struct ui_out * mi_ui_out (struct interp *interp) { - struct mi_interp *mi = interp_data (interp); + struct mi_interp *mi = (struct mi_interp *) interp_data (interp); return mi->mi_uiout; } @@ -1096,7 +1097,7 @@ static int mi_set_logging (struct interp *interp, int start_log, struct ui_file *out, struct ui_file *logfile) { - struct mi_interp *mi = interp_data (interp); + struct mi_interp *mi = (struct mi_interp *) interp_data (interp); if (!mi) return 0; diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 8712a7f..3ad11bb 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -610,7 +610,7 @@ struct collect_cores_data static int collect_cores (struct thread_info *ti, void *xdata) { - struct collect_cores_data *data = xdata; + struct collect_cores_data *data = (struct collect_cores_data *) xdata; if (ptid_get_pid (ti->ptid) == data->pid) { @@ -643,7 +643,8 @@ struct print_one_inferior_data static int print_one_inferior (struct inferior *inferior, void *xdata) { - struct print_one_inferior_data *top_data = xdata; + struct print_one_inferior_data *top_data + = (struct print_one_inferior_data *) xdata; struct ui_out *uiout = current_uiout; if (VEC_empty (int, top_data->inferiors) @@ -728,7 +729,7 @@ output_cores (struct ui_out *uiout, const char *field_name, const char *xcores) static void free_vector_of_ints (void *xvector) { - VEC (int) **vector = xvector; + VEC (int) **vector = (VEC (int) **) xvector; VEC_free (int, *vector); } @@ -759,7 +760,7 @@ splay_tree_int_comparator (splay_tree_key xa, splay_tree_key xb) static void free_splay_tree (void *xt) { - splay_tree t = xt; + splay_tree t = (splay_tree) xt; splay_tree_delete (t); } @@ -2150,7 +2151,8 @@ mi_execute_command (const char *cmd, int from_tty) =thread-selected is supposed to indicate user's intentions. */ && strcmp (command->command, "thread-select") != 0) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi + = (struct mi_interp *) top_level_interpreter_data (); int report_change = 0; if (command->thread == -1) diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index ef0a2df..b234bba 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -120,7 +120,7 @@ mi_table_begin (struct ui_out *uiout, void mi_table_body (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -134,7 +134,7 @@ mi_table_body (struct ui_out *uiout) void mi_table_end (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); data->suppress_output = 0; mi_close (uiout, ui_out_type_list); /* body */ @@ -147,7 +147,7 @@ void mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment, const char *col_name, const char *colhdr) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -166,7 +166,7 @@ void mi_begin (struct ui_out *uiout, enum ui_out_type type, int level, const char *id) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -179,7 +179,7 @@ mi_begin (struct ui_out *uiout, enum ui_out_type type, int level, void mi_end (struct ui_out *uiout, enum ui_out_type type, int level) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -194,7 +194,7 @@ mi_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align alignment, const char *fldname, int value) { char buffer[20]; /* FIXME: how many chars long a %d can become? */ - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -218,7 +218,7 @@ void mi_field_string (struct ui_out *uiout, int fldno, int width, enum ui_align align, const char *fldname, const char *string) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream; if (data->suppress_output) @@ -241,7 +241,7 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align, const char *fldname, const char *format, va_list args) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream; if (data->suppress_output) @@ -282,7 +282,7 @@ mi_wrap_hint (struct ui_out *uiout, char *identstring) void mi_flush (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); gdb_flush (stream); @@ -291,7 +291,7 @@ mi_flush (struct ui_out *uiout) int mi_redirect (struct ui_out *uiout, struct ui_file *outstream) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (outstream != NULL) VEC_safe_push (ui_filep, data->streams, outstream); @@ -308,7 +308,7 @@ mi_redirect (struct ui_out *uiout, struct ui_file *outstream) static void field_separator (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); if (data->suppress_field_separator) @@ -320,7 +320,7 @@ field_separator (struct ui_out *uiout) static void mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); field_separator (uiout); @@ -343,7 +343,7 @@ mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) static void mi_close (struct ui_out *uiout, enum ui_out_type type) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); switch (type) @@ -365,7 +365,7 @@ mi_close (struct ui_out *uiout, enum ui_out_type type) void mi_out_buffered (struct ui_out *uiout, char *string) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); fprintf_unfiltered (stream, "%s", string); @@ -376,7 +376,7 @@ mi_out_buffered (struct ui_out *uiout, char *string) void mi_out_rewind (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file_rewind (stream); @@ -387,7 +387,7 @@ mi_out_rewind (struct ui_out *uiout) void mi_out_put (struct ui_out *uiout, struct ui_file *stream) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *outstream = VEC_last (ui_filep, data->streams); ui_file_put (outstream, ui_file_write_for_put, stream); @@ -399,7 +399,7 @@ mi_out_put (struct ui_out *uiout, struct ui_file *stream) int mi_version (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); return data->mi_version; } @@ -424,7 +424,7 @@ mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream) static void mi_out_data_dtor (struct ui_out *ui_out) { - mi_out_data *data = ui_out_data (ui_out); + mi_out_data *data = (mi_out_data *) ui_out_data (ui_out); VEC_free (ui_filep, data->streams); xfree (data); diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index 92efe26..55ac3a5 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -229,7 +229,7 @@ mi_parse_free (struct mi_parse *parse) static void mi_parse_cleanup (void *arg) { - mi_parse_free (arg); + mi_parse_free ((struct mi_parse *) arg); } struct mi_parse * |