Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Remove expecting_notif parameter from getpkt_or_notif_sane_1

Browse Source 
For getpkt_or_notif_sane_1, expecting_notif is redundant, because it
always reflects whether the is_notif parameter is non-NULL.  This
patch removes the redundant parameter.

Reviewed-by: John Baldwin <jhb@FreeBSD.org>
This commit is contained in:
Tom Tromey
2023-08-28 10:17:32 -06:00
parent 74b180e0d8
commit ef6a984378
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/remote.c
View File

@@ -1214,7 +1214,7 @@ public: /* Remote specific methods. */
void skip_frame (); void skip_frame ();
long read_frame (gdb::char_vector *buf_p); long read_frame (gdb::char_vector *buf_p);
int getpkt_or_notif_sane_1 (gdb::char_vector *buf, int forever, int getpkt_or_notif_sane_1 (gdb::char_vector *buf, int forever,
int expecting_notif, int *is_notif); int *is_notif);
int getpkt (gdb::char_vector *buf, int forever); int getpkt (gdb::char_vector *buf, int forever);
int getpkt_or_notif_sane (gdb::char_vector *buf, int forever, int getpkt_or_notif_sane (gdb::char_vector *buf, int forever,
int *is_notif); int *is_notif);
@@ -10049,14 +10049,15 @@ show_watchdog (struct ui_file *file, int from_tty,
synchronous mode) to wait for a target that is is executing user synchronous mode) to wait for a target that is is executing user
code to stop. If FOREVER == 0, this function is allowed to time code to stop. If FOREVER == 0, this function is allowed to time
out gracefully and return an indication of this to the caller. out gracefully and return an indication of this to the caller.
Otherwise return the number of bytes read. If EXPECTING_NOTIF, Otherwise return the number of bytes read. If IS_NOTIF is not
consider receiving a notification enough reason to return to the NULL, then consider receiving a notification enough reason to
caller. *IS_NOTIF is an output boolean that indicates whether *BUF return to the caller. In this case, *IS_NOTIF is an output boolean
holds a notification or not (a regular packet). */ that indicates whether *BUF holds a notification or not (a regular
packet). */
int int
remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf, remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf,
int forever, int expecting_notif, int forever,
int *is_notif) int *is_notif)
{ {
struct remote_state *rs = get_remote_state (); struct remote_state *rs = get_remote_state ();
@@ -10069,7 +10070,7 @@ remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf,
if (forever) if (forever)
timeout = watchdog > 0 ? watchdog : -1; timeout = watchdog > 0 ? watchdog : -1;
else if (expecting_notif) else if (is_notif != nullptr)
timeout = 0; /* There should already be a char in the buffer. If timeout = 0; /* There should already be a char in the buffer. If
not, bail out. */ not, bail out. */
else else
@@ -10100,7 +10101,7 @@ remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf,
if (c == SERIAL_TIMEOUT) if (c == SERIAL_TIMEOUT)
{ {
if (expecting_notif) if (is_notif != nullptr)
return -1; /* Don't complain, it's normal to not get return -1; /* Don't complain, it's normal to not get
anything in this case. */ anything in this case. */
@@ -10188,7 +10189,7 @@ remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf,
/* Notifications require no acknowledgement. */ /* Notifications require no acknowledgement. */
if (expecting_notif) if (is_notif != nullptr)
return val; return val;
} }
} }
@@ -10203,14 +10204,14 @@ remote_target::getpkt_or_notif_sane_1 (gdb::char_vector *buf,
int int
remote_target::getpkt (gdb::char_vector *buf, int forever) remote_target::getpkt (gdb::char_vector *buf, int forever)
{ {
return getpkt_or_notif_sane_1 (buf, forever, 0, NULL); return getpkt_or_notif_sane_1 (buf, forever, NULL);
} }
int int
remote_target::getpkt_or_notif_sane (gdb::char_vector *buf, int forever, remote_target::getpkt_or_notif_sane (gdb::char_vector *buf, int forever,
int *is_notif) int *is_notif)
{ {
return getpkt_or_notif_sane_1 (buf, forever, 1, is_notif); return getpkt_or_notif_sane_1 (buf, forever, is_notif);
} }
/* Kill any new fork children of inferior INF that haven't been /* Kill any new fork children of inferior INF that haven't been