diff options
author | Pedro Alves <palves@redhat.com> | 2017-09-29 17:15:36 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-09-29 17:15:36 +0100 |
commit | 256642e857886f1e3da86ce2484f9df5a5a6b904 (patch) | |
tree | 80086d69d81e32f997070c0ca6700a7c38f94b27 /gdb/gdbserver/server.c | |
parent | b6bb34680b9c99961b6cd635853552ec6569a2a4 (diff) | |
download | gdb-256642e857886f1e3da86ce2484f9df5a5a6b904.zip gdb-256642e857886f1e3da86ce2484f9df5a5a6b904.tar.gz gdb-256642e857886f1e3da86ce2484f9df5a5a6b904.tar.bz2 |
Constify unpack_varlen_hex & fix fallout
I ran into non-const unpack_varlen_hex while working on something
else, and decided to just fix it first. Ends up constifying a good
deal of remote packet parsing.
gdb/ChangeLog:
2017-09-29 Pedro Alves <palves@redhat.com>
* common/rsp-low.c (unpack_varlen_hex): Constify.
* common/rsp-low.h (unpack_varlen_hex): Constify.
* linux-nat.c (linux_child_static_tracepoint_markers_by_strid):
Constify.
* remote.c (remote_set_permissions, read_ptid)
(remote_current_thread, remote_get_threads_with_qthreadinfo)
(remote_static_tracepoint_marker_at)
(remote_static_tracepoint_markers_by_strid)
(stop_reply_extract_thread, remote_parse_stop_reply): Constify.
* tracepoint.c (parse_trace_status, parse_tracepoint_status)
(parse_tracepoint_definition, parse_tsv_definition)
(parse_static_tracepoint_marker_definition): Constify.
* tracepoint.h (parse_static_tracepoint_marker_definition)
(parse_trace_status, parse_tracepoint_status)
(parse_tracepoint_definition, parse_tsv_definition): Constify.
gdb/gdbserver/ChangeLog:
2017-09-29 Pedro Alves <palves@redhat.com>
* ax.c (gdb_parse_agent_expr): Constify.
* ax.h (gdb_parse_agent_expr): Constify.
* mem-break.c (add_breakpoint_condition, add_breakpoint_commands):
Constify.
* mem-break.h (add_breakpoint_condition, add_breakpoint_commands): Constify.
* remote-utils.c (hex_or_minus_one, read_ptid): Constify.
* remote-utils.h (read_ptid): Constify.
* server.c (handle_qxfer_exec_file, handle_query, handle_v_cont)
(process_point_options, process_serial_event): Constify.
* tracepoint.c (add_tracepoint_action, cmd_qtdp, cmd_qtdpsrc)
(cmd_qtdv, cmd_qtenable_disable, cmd_qtro, cmd_qtframe, cmd_qtp)
(cmd_qtbuffer): Constify.
Diffstat (limited to 'gdb/gdbserver/server.c')
-rw-r--r-- | gdb/gdbserver/server.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index f3eee31..c4f1e8d 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1427,7 +1427,7 @@ handle_qxfer_auxv (const char *annex, /* Handle qXfer:exec-file:read. */ static int -handle_qxfer_exec_file (const char *const_annex, +handle_qxfer_exec_file (const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, LONGEST len) { @@ -1438,7 +1438,7 @@ handle_qxfer_exec_file (const char *const_annex, if (the_target->pid_to_exec_file == NULL || writebuf != NULL) return -2; - if (const_annex[0] == '\0') + if (annex[0] == '\0') { if (current_thread == NULL) return -1; @@ -1447,11 +1447,7 @@ handle_qxfer_exec_file (const char *const_annex, } else { - char *annex = (char *) alloca (strlen (const_annex) + 1); - - strcpy (annex, const_annex); annex = unpack_varlen_hex (annex, &pid); - if (annex[0] != '\0') return -1; } @@ -2535,7 +2531,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (the_target->get_tib_address != NULL && startswith (own_buf, "qGetTIBAddr:")) { - char *annex; + const char *annex; int n; CORE_ADDR tlb; ptid_t ptid = read_ptid (own_buf + 12, &annex); @@ -2623,7 +2619,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (startswith (own_buf, "qCRC:")) { /* CRC check (compare-section). */ - char *comma; + const char *comma; ULONGEST base; int len; unsigned long long crc; @@ -2732,7 +2728,7 @@ handle_pending_status (const struct thread_resume *resumption, static void handle_v_cont (char *own_buf) { - char *p, *q; + const char *p; int n = 0, i = 0; struct thread_resume *resume_info; struct thread_resume default_action { null_ptid }; @@ -2771,8 +2767,8 @@ handle_v_cont (char *own_buf) if (p[0] == 'S' || p[0] == 'C') { - int sig; - sig = strtol (p + 1, &q, 16); + char *q; + int sig = strtol (p + 1, &q, 16); if (p == q) goto err; p = q; @@ -2809,6 +2805,7 @@ handle_v_cont (char *own_buf) } else if (p[0] == ':') { + const char *q; ptid_t ptid = read_ptid (p + 1, &q); if (p == q) @@ -4009,9 +4006,9 @@ main (int argc, char *argv[]) after the last processed option. */ static void -process_point_options (struct gdb_breakpoint *bp, char **packet) +process_point_options (struct gdb_breakpoint *bp, const char **packet) { - char *dataptr = *packet; + const char *dataptr = *packet; int persist; /* Check if data has the correct format. */ @@ -4273,7 +4270,7 @@ process_serial_event (void) char type = own_buf[1]; int res; const int insert = ch == 'Z'; - char *p = &own_buf[3]; + const char *p = &own_buf[3]; p = unpack_varlen_hex (p, &addr); kind = strtol (p + 1, &dataptr, 16); @@ -4293,7 +4290,8 @@ process_serial_event (void) is telling us to drop that list and use this one instead. */ clear_breakpoint_conditions_and_commands (bp); - process_point_options (bp, &dataptr); + const char *options = dataptr; + process_point_options (bp, &options); } } else |