* remote.c, target.c: Strip trailing whitespace.

This commit is contained in:
Daniel Jacobowitz 2006-08-16 18:31:03 +00:00
parent 3e9e4fcfb0
commit 2bc416ba69
3 changed files with 134 additions and 130 deletions

View File

@ -1,3 +1,7 @@
2006-08-16 Daniel Jacobowitz <dan@codesourcery.com>
* remote.c, target.c: Strip trailing whitespace.
2006-08-15 Daniel Jacobowitz <dan@codesourcery.com> 2006-08-15 Daniel Jacobowitz <dan@codesourcery.com>
PR remote/1966 PR remote/1966

View File

@ -255,7 +255,7 @@ struct packet_reg
long regnum; /* GDB's internal register number. */ long regnum; /* GDB's internal register number. */
LONGEST pnum; /* Remote protocol register number. */ LONGEST pnum; /* Remote protocol register number. */
int in_g_packet; /* Always part of G packet. */ int in_g_packet; /* Always part of G packet. */
/* long size in bytes; == register_size (current_gdbarch, regnum); /* long size in bytes; == register_size (current_gdbarch, regnum);
at present. */ at present. */
/* char *name; == REGISTER_NAME (regnum); at present. */ /* char *name; == REGISTER_NAME (regnum); at present. */
}; };
@ -1041,12 +1041,12 @@ typedef int gdb_threadref; /* Internal GDB thread reference. */
struct gdb_ext_thread_info struct gdb_ext_thread_info
{ {
threadref threadid; /* External form of thread reference. */ threadref threadid; /* External form of thread reference. */
int active; /* Has state interesting to GDB? int active; /* Has state interesting to GDB?
regs, stack. */ regs, stack. */
char display[256]; /* Brief state display, name, char display[256]; /* Brief state display, name,
blocked/suspended. */ blocked/suspended. */
char shortname[32]; /* To be used to name threads. */ char shortname[32]; /* To be used to name threads. */
char more_display[256]; /* Long info, statistics, queue depth, char more_display[256]; /* Long info, statistics, queue depth,
whatever. */ whatever. */
}; };
@ -1092,7 +1092,7 @@ static void copy_threadref (threadref *dest, threadref *src);
static int threadmatch (threadref *dest, threadref *src); static int threadmatch (threadref *dest, threadref *src);
static char *pack_threadinfo_request (char *pkt, int mode, static char *pack_threadinfo_request (char *pkt, int mode,
threadref *id); threadref *id);
static int remote_unpack_thread_info_response (char *pkt, static int remote_unpack_thread_info_response (char *pkt,
@ -1101,7 +1101,7 @@ static int remote_unpack_thread_info_response (char *pkt,
*info); *info);
static int remote_get_threadinfo (threadref *threadid, static int remote_get_threadinfo (threadref *threadid,
int fieldset, /*TAG mask */ int fieldset, /*TAG mask */
struct gdb_ext_thread_info *info); struct gdb_ext_thread_info *info);
@ -1112,14 +1112,14 @@ static char *pack_threadlist_request (char *pkt, int startflag,
static int parse_threadlist_response (char *pkt, static int parse_threadlist_response (char *pkt,
int result_limit, int result_limit,
threadref *original_echo, threadref *original_echo,
threadref *resultlist, threadref *resultlist,
int *doneflag); int *doneflag);
static int remote_get_threadlist (int startflag, static int remote_get_threadlist (int startflag,
threadref *nextthread, threadref *nextthread,
int result_limit, int result_limit,
int *done, int *done,
int *result_count, int *result_count,
threadref *threadlist); threadref *threadlist);
typedef int (*rmt_thread_action) (threadref *ref, void *context); typedef int (*rmt_thread_action) (threadref *ref, void *context);
@ -1819,13 +1819,13 @@ remote_threads_extra_info (struct thread_info *tp)
if (threadinfo.active) if (threadinfo.active)
{ {
if (*threadinfo.shortname) if (*threadinfo.shortname)
n += xsnprintf (&display_buf[0], sizeof (display_buf) - n, n += xsnprintf (&display_buf[0], sizeof (display_buf) - n,
" Name: %s,", threadinfo.shortname); " Name: %s,", threadinfo.shortname);
if (*threadinfo.display) if (*threadinfo.display)
n += xsnprintf (&display_buf[n], sizeof (display_buf) - n, n += xsnprintf (&display_buf[n], sizeof (display_buf) - n,
" State: %s,", threadinfo.display); " State: %s,", threadinfo.display);
if (*threadinfo.more_display) if (*threadinfo.more_display)
n += xsnprintf (&display_buf[n], sizeof (display_buf) - n, n += xsnprintf (&display_buf[n], sizeof (display_buf) - n,
" Priority: %s", threadinfo.more_display); " Priority: %s", threadinfo.more_display);
if (n > 0) if (n > 0)
@ -1853,7 +1853,7 @@ extended_remote_restart (void)
putpkt (rs->buf); putpkt (rs->buf);
remote_fileio_reset (); remote_fileio_reset ();
/* Now query for status so this looks just like we restarted /* Now query for status so this looks just like we restarted
gdbserver from scratch. */ gdbserver from scratch. */
putpkt ("?"); putpkt ("?");
@ -2813,10 +2813,10 @@ cleanup_sigint_signal_handler (void *dummy)
{ {
signal (SIGINT, handle_sigint); signal (SIGINT, handle_sigint);
if (sigint_remote_twice_token) if (sigint_remote_twice_token)
delete_async_signal_handler ((struct async_signal_handler **) delete_async_signal_handler ((struct async_signal_handler **)
&sigint_remote_twice_token); &sigint_remote_twice_token);
if (sigint_remote_token) if (sigint_remote_token)
delete_async_signal_handler ((struct async_signal_handler **) delete_async_signal_handler ((struct async_signal_handler **)
&sigint_remote_token); &sigint_remote_token);
} }
@ -3069,18 +3069,18 @@ Packet: '%s'\n"),
phex_nz (pnum, 0), p, buf); phex_nz (pnum, 0), p, buf);
fieldsize = hex2bin (p, regs, fieldsize = hex2bin (p, regs,
register_size (current_gdbarch, register_size (current_gdbarch,
reg->regnum)); reg->regnum));
p += 2 * fieldsize; p += 2 * fieldsize;
if (fieldsize < register_size (current_gdbarch, if (fieldsize < register_size (current_gdbarch,
reg->regnum)) reg->regnum))
warning (_("Remote reply is too short: %s"), buf); warning (_("Remote reply is too short: %s"), buf);
regcache_raw_supply (current_regcache, regcache_raw_supply (current_regcache,
reg->regnum, regs); reg->regnum, regs);
} }
if (*p++ != ';') if (*p++ != ';')
error (_("Remote register badly formatted: %s\nhere: %s"), error (_("Remote register badly formatted: %s\nhere: %s"),
buf, p); buf, p);
} }
} }
@ -3265,10 +3265,10 @@ Packet: '%s'\n"),
pnum, p, buf); pnum, p, buf);
fieldsize = hex2bin (p, regs, fieldsize = hex2bin (p, regs,
register_size (current_gdbarch, register_size (current_gdbarch,
reg->regnum)); reg->regnum));
p += 2 * fieldsize; p += 2 * fieldsize;
if (fieldsize < register_size (current_gdbarch, if (fieldsize < register_size (current_gdbarch,
reg->regnum)) reg->regnum))
warning (_("Remote reply is too short: %s"), buf); warning (_("Remote reply is too short: %s"), buf);
regcache_raw_supply (current_regcache, reg->regnum, regs); regcache_raw_supply (current_regcache, reg->regnum, regs);
@ -3878,7 +3878,7 @@ remote_write_bytes (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
check_binary_download (memaddr); check_binary_download (memaddr);
payload_size = get_memory_write_packet_size (); payload_size = get_memory_write_packet_size ();
/* The packet buffer will be large enough for the payload; /* The packet buffer will be large enough for the payload;
get_memory_packet_size ensures this. */ get_memory_packet_size ensures this. */
buf = rs->buf; buf = rs->buf;
@ -4274,7 +4274,7 @@ putpkt_binary (char *buf, int cnt)
case '$': case '$':
{ {
if (remote_debug) if (remote_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"Packet instead of Ack, ignoring it\n"); "Packet instead of Ack, ignoring it\n");
/* It's probably an old response sent because an ACK /* It's probably an old response sent because an ACK
was lost. Gobble up the packet and ack it so it was lost. Gobble up the packet and ack it so it
@ -4400,14 +4400,14 @@ read_frame (char **buf_p,
if (check_0 == SERIAL_TIMEOUT || check_1 == SERIAL_TIMEOUT) if (check_0 == SERIAL_TIMEOUT || check_1 == SERIAL_TIMEOUT)
{ {
if (remote_debug) if (remote_debug)
fputs_filtered ("Timeout in checksum, retrying\n", fputs_filtered ("Timeout in checksum, retrying\n",
gdb_stdlog); gdb_stdlog);
return -1; return -1;
} }
else if (check_0 < 0 || check_1 < 0) else if (check_0 < 0 || check_1 < 0)
{ {
if (remote_debug) if (remote_debug)
fputs_filtered ("Communication error in checksum\n", fputs_filtered ("Communication error in checksum\n",
gdb_stdlog); gdb_stdlog);
return -1; return -1;
} }
@ -4574,7 +4574,7 @@ getpkt_sane (char **buf, long *sizeof_buf, int forever)
serial_write (remote_desc, "-", 1); serial_write (remote_desc, "-", 1);
} }
/* We have tried hard enough, and just can't receive the packet. /* We have tried hard enough, and just can't receive the packet.
Give up. */ Give up. */
printf_unfiltered (_("Ignoring packet error, continuing...\n")); printf_unfiltered (_("Ignoring packet error, continuing...\n"));
@ -4989,7 +4989,7 @@ remote_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE) if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
return -1; return -1;
*(p++) = 'Z'; *(p++) = 'Z';
*(p++) = '1'; *(p++) = '1';
*(p++) = ','; *(p++) = ',';
@ -5733,7 +5733,7 @@ remote_is_async_p (void)
will be able to delay notifying the client of an event until the will be able to delay notifying the client of an event until the
point where an entire packet has been received. */ point where an entire packet has been received. */
static void (*async_client_callback) (enum inferior_event_type event_type, static void (*async_client_callback) (enum inferior_event_type event_type,
void *context); void *context);
static void *async_client_context; static void *async_client_context;
static serial_event_ftype remote_async_serial_handler; static serial_event_ftype remote_async_serial_handler;
@ -5747,7 +5747,7 @@ remote_async_serial_handler (struct serial *scb, void *context)
} }
static void static void
remote_async (void (*callback) (enum inferior_event_type event_type, remote_async (void (*callback) (enum inferior_event_type event_type,
void *context), void *context) void *context), void *context)
{ {
if (current_target.to_async_mask_value == 0) if (current_target.to_async_mask_value == 0)
@ -5774,7 +5774,7 @@ static void
init_remote_async_ops (void) init_remote_async_ops (void)
{ {
remote_async_ops.to_shortname = "async"; remote_async_ops.to_shortname = "async";
remote_async_ops.to_longname = remote_async_ops.to_longname =
"Remote serial target in async version of the gdb-specific protocol"; "Remote serial target in async version of the gdb-specific protocol";
remote_async_ops.to_doc = remote_async_ops.to_doc =
"Use a remote computer via a serial line, using a gdb-specific protocol.\n\ "Use a remote computer via a serial line, using a gdb-specific protocol.\n\
@ -5902,7 +5902,7 @@ _initialize_remote (void)
struct remote_state *rs; struct remote_state *rs;
/* architecture specific data */ /* architecture specific data */
remote_gdbarch_data_handle = remote_gdbarch_data_handle =
gdbarch_data_register_post_init (init_remote_state); gdbarch_data_register_post_init (init_remote_state);
/* Old tacky stuff. NOTE: This comes after the remote protocol so /* Old tacky stuff. NOTE: This comes after the remote protocol so

View File

@ -167,7 +167,7 @@ static void debug_to_stop (void);
struct target_ops deprecated_child_ops; struct target_ops deprecated_child_ops;
/* Pointer to array of target architecture structures; the size of the /* Pointer to array of target architecture structures; the size of the
array; the current index into the array; the allocated size of the array; the current index into the array; the allocated size of the
array. */ array. */
struct target_ops **target_structs; struct target_ops **target_structs;
unsigned target_struct_size; unsigned target_struct_size;
@ -475,44 +475,44 @@ update_current_target (void)
if (!current_target.field) \ if (!current_target.field) \
current_target.field = value current_target.field = value
de_fault (to_open, de_fault (to_open,
(void (*) (char *, int)) (void (*) (char *, int))
tcomplain); tcomplain);
de_fault (to_close, de_fault (to_close,
(void (*) (int)) (void (*) (int))
target_ignore); target_ignore);
de_fault (to_attach, de_fault (to_attach,
maybe_kill_then_attach); maybe_kill_then_attach);
de_fault (to_post_attach, de_fault (to_post_attach,
(void (*) (int)) (void (*) (int))
target_ignore); target_ignore);
de_fault (to_detach, de_fault (to_detach,
(void (*) (char *, int)) (void (*) (char *, int))
target_ignore); target_ignore);
de_fault (to_resume, de_fault (to_resume,
(void (*) (ptid_t, int, enum target_signal)) (void (*) (ptid_t, int, enum target_signal))
noprocess); noprocess);
de_fault (to_wait, de_fault (to_wait,
(ptid_t (*) (ptid_t, struct target_waitstatus *)) (ptid_t (*) (ptid_t, struct target_waitstatus *))
noprocess); noprocess);
de_fault (to_fetch_registers, de_fault (to_fetch_registers,
(void (*) (int)) (void (*) (int))
target_ignore); target_ignore);
de_fault (to_store_registers, de_fault (to_store_registers,
(void (*) (int)) (void (*) (int))
noprocess); noprocess);
de_fault (to_prepare_to_store, de_fault (to_prepare_to_store,
(void (*) (void)) (void (*) (void))
noprocess); noprocess);
de_fault (deprecated_xfer_memory, de_fault (deprecated_xfer_memory,
(int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *))
nomemory); nomemory);
de_fault (to_files_info, de_fault (to_files_info,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
target_ignore); target_ignore);
de_fault (to_insert_breakpoint, de_fault (to_insert_breakpoint,
memory_insert_breakpoint); memory_insert_breakpoint);
de_fault (to_remove_breakpoint, de_fault (to_remove_breakpoint,
memory_remove_breakpoint); memory_remove_breakpoint);
de_fault (to_can_use_hw_breakpoint, de_fault (to_can_use_hw_breakpoint,
(int (*) (int, int, int)) (int (*) (int, int, int))
@ -537,105 +537,105 @@ update_current_target (void)
return_zero); return_zero);
de_fault (to_region_ok_for_hw_watchpoint, de_fault (to_region_ok_for_hw_watchpoint,
default_region_ok_for_hw_watchpoint); default_region_ok_for_hw_watchpoint);
de_fault (to_terminal_init, de_fault (to_terminal_init,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_terminal_inferior, de_fault (to_terminal_inferior,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_terminal_ours_for_output, de_fault (to_terminal_ours_for_output,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_terminal_ours, de_fault (to_terminal_ours,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_terminal_save_ours, de_fault (to_terminal_save_ours,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_terminal_info, de_fault (to_terminal_info,
default_terminal_info); default_terminal_info);
de_fault (to_kill, de_fault (to_kill,
(void (*) (void)) (void (*) (void))
noprocess); noprocess);
de_fault (to_load, de_fault (to_load,
(void (*) (char *, int)) (void (*) (char *, int))
tcomplain); tcomplain);
de_fault (to_lookup_symbol, de_fault (to_lookup_symbol,
(int (*) (char *, CORE_ADDR *)) (int (*) (char *, CORE_ADDR *))
nosymbol); nosymbol);
de_fault (to_create_inferior, de_fault (to_create_inferior,
maybe_kill_then_create_inferior); maybe_kill_then_create_inferior);
de_fault (to_post_startup_inferior, de_fault (to_post_startup_inferior,
(void (*) (ptid_t)) (void (*) (ptid_t))
target_ignore); target_ignore);
de_fault (to_acknowledge_created_inferior, de_fault (to_acknowledge_created_inferior,
(void (*) (int)) (void (*) (int))
target_ignore); target_ignore);
de_fault (to_insert_fork_catchpoint, de_fault (to_insert_fork_catchpoint,
(void (*) (int)) (void (*) (int))
tcomplain); tcomplain);
de_fault (to_remove_fork_catchpoint, de_fault (to_remove_fork_catchpoint,
(int (*) (int)) (int (*) (int))
tcomplain); tcomplain);
de_fault (to_insert_vfork_catchpoint, de_fault (to_insert_vfork_catchpoint,
(void (*) (int)) (void (*) (int))
tcomplain); tcomplain);
de_fault (to_remove_vfork_catchpoint, de_fault (to_remove_vfork_catchpoint,
(int (*) (int)) (int (*) (int))
tcomplain); tcomplain);
de_fault (to_insert_exec_catchpoint, de_fault (to_insert_exec_catchpoint,
(void (*) (int)) (void (*) (int))
tcomplain); tcomplain);
de_fault (to_remove_exec_catchpoint, de_fault (to_remove_exec_catchpoint,
(int (*) (int)) (int (*) (int))
tcomplain); tcomplain);
de_fault (to_reported_exec_events_per_exec_call, de_fault (to_reported_exec_events_per_exec_call,
(int (*) (void)) (int (*) (void))
return_one); return_one);
de_fault (to_has_exited, de_fault (to_has_exited,
(int (*) (int, int, int *)) (int (*) (int, int, int *))
return_zero); return_zero);
de_fault (to_mourn_inferior, de_fault (to_mourn_inferior,
(void (*) (void)) (void (*) (void))
noprocess); noprocess);
de_fault (to_can_run, de_fault (to_can_run,
return_zero); return_zero);
de_fault (to_notice_signals, de_fault (to_notice_signals,
(void (*) (ptid_t)) (void (*) (ptid_t))
target_ignore); target_ignore);
de_fault (to_thread_alive, de_fault (to_thread_alive,
(int (*) (ptid_t)) (int (*) (ptid_t))
return_zero); return_zero);
de_fault (to_find_new_threads, de_fault (to_find_new_threads,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
de_fault (to_extra_thread_info, de_fault (to_extra_thread_info,
(char *(*) (struct thread_info *)) (char *(*) (struct thread_info *))
return_zero); return_zero);
de_fault (to_stop, de_fault (to_stop,
(void (*) (void)) (void (*) (void))
target_ignore); target_ignore);
current_target.to_xfer_partial = current_xfer_partial; current_target.to_xfer_partial = current_xfer_partial;
de_fault (to_rcmd, de_fault (to_rcmd,
(void (*) (char *, struct ui_file *)) (void (*) (char *, struct ui_file *))
tcomplain); tcomplain);
de_fault (to_enable_exception_callback, de_fault (to_enable_exception_callback,
(struct symtab_and_line * (*) (enum exception_event_kind, int)) (struct symtab_and_line * (*) (enum exception_event_kind, int))
nosupport_runtime); nosupport_runtime);
de_fault (to_get_current_exception_event, de_fault (to_get_current_exception_event,
(struct exception_event_record * (*) (void)) (struct exception_event_record * (*) (void))
nosupport_runtime); nosupport_runtime);
de_fault (to_pid_to_exec_file, de_fault (to_pid_to_exec_file,
(char *(*) (int)) (char *(*) (int))
return_zero); return_zero);
de_fault (to_can_async_p, de_fault (to_can_async_p,
(int (*) (void)) (int (*) (void))
return_zero); return_zero);
de_fault (to_is_async_p, de_fault (to_is_async_p,
(int (*) (void)) (int (*) (void))
return_zero); return_zero);
de_fault (to_async, de_fault (to_async,
(void (*) (void (*) (enum inferior_event_type, void*), void*)) (void (*) (void (*) (enum inferior_event_type, void*), void*))
tcomplain); tcomplain);
#undef de_fault #undef de_fault
@ -703,7 +703,7 @@ push_target (struct target_ops *t)
return (t != target_stack); return (t != target_stack);
} }
/* Remove a target_ops vector from the stack, wherever it may be. /* Remove a target_ops vector from the stack, wherever it may be.
Return how many times it was removed (0 or 1). */ Return how many times it was removed (0 or 1). */
int int
@ -986,7 +986,7 @@ target_xfer_partial (struct target_ops *ops,
if (retval > 0 && myaddr != NULL) if (retval > 0 && myaddr != NULL)
{ {
int i; int i;
fputs_unfiltered (", bytes =", gdb_stdlog); fputs_unfiltered (", bytes =", gdb_stdlog);
for (i = 0; i < retval; i++) for (i = 0; i < retval; i++)
{ {
@ -999,11 +999,11 @@ target_xfer_partial (struct target_ops *ops,
} }
fprintf_unfiltered (gdb_stdlog, "\n"); fprintf_unfiltered (gdb_stdlog, "\n");
} }
fprintf_unfiltered (gdb_stdlog, " %02x", myaddr[i] & 0xff); fprintf_unfiltered (gdb_stdlog, " %02x", myaddr[i] & 0xff);
} }
} }
fputc_unfiltered ('\n', gdb_stdlog); fputc_unfiltered ('\n', gdb_stdlog);
} }
return retval; return retval;
@ -1068,7 +1068,7 @@ Mode for reading from readonly sections is %s.\n"),
static LONGEST static LONGEST
default_xfer_partial (struct target_ops *ops, enum target_object object, default_xfer_partial (struct target_ops *ops, enum target_object object,
const char *annex, gdb_byte *readbuf, const char *annex, gdb_byte *readbuf,
const gdb_byte *writebuf, ULONGEST offset, LONGEST len) const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
{ {
if (object == TARGET_OBJECT_MEMORY if (object == TARGET_OBJECT_MEMORY
@ -1547,7 +1547,7 @@ target_resize_to_sections (struct target_ops *target, int num_added)
/* Check to see if anyone else was pointing to this structure. /* Check to see if anyone else was pointing to this structure.
If old_value was null, then no one was. */ If old_value was null, then no one was. */
if (old_value) if (old_value)
{ {
for (t = target_structs; t < target_structs + target_struct_size; for (t = target_structs; t < target_structs + target_struct_size;
@ -1567,7 +1567,7 @@ target_resize_to_sections (struct target_ops *target, int num_added)
current_target.to_sections_end = target->to_sections_end; current_target.to_sections_end = target->to_sections_end;
} }
} }
return old_count; return old_count;
} }
@ -1960,7 +1960,7 @@ deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len,
} }
fprintf_unfiltered (gdb_stdlog, "\n"); fprintf_unfiltered (gdb_stdlog, "\n");
} }
fprintf_unfiltered (gdb_stdlog, " %02x", myaddr[i] & 0xff); fprintf_unfiltered (gdb_stdlog, " %02x", myaddr[i] & 0xff);
} }
} }
@ -2512,7 +2512,7 @@ command."),
show_targetdebug, show_targetdebug,
&setdebuglist, &showdebuglist); &setdebuglist, &showdebuglist);
add_setshow_boolean_cmd ("trust-readonly-sections", class_support, add_setshow_boolean_cmd ("trust-readonly-sections", class_support,
&trust_readonly, _("\ &trust_readonly, _("\
Set mode for reading from readonly sections."), _("\ Set mode for reading from readonly sections."), _("\
Show mode for reading from readonly sections."), _("\ Show mode for reading from readonly sections."), _("\