public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Reindent gdbsupport/event-loop.cc:handle_file_event
@ 2022-05-16 18:58 Pedro Alves
0 siblings, 0 replies; only message in thread
From: Pedro Alves @ 2022-05-16 18:58 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=187075ebbc0cba7b58685c7214028e791b5af844
commit 187075ebbc0cba7b58685c7214028e791b5af844
Author: Pedro Alves <pedro@palves.net>
Date: Mon May 16 12:20:08 2022 +0100
Reindent gdbsupport/event-loop.cc:handle_file_event
The handle_file_event function has a few unnecessary {} lexical
blocks, presumably because they were originally if blocks, and the
conditions were removed, or something along those lines.
Remove the unnecessary blocks, and reindent.
Change-Id: Iaecbe5c9f4940a80b81dbbc42e51ce506f6aafb2
Diff:
---
gdbsupport/event-loop.cc | 104 +++++++++++++++++++++++------------------------
1 file changed, 50 insertions(+), 54 deletions(-)
diff --git a/gdbsupport/event-loop.cc b/gdbsupport/event-loop.cc
index 18f57ef8d61..f078c1278a8 100644
--- a/gdbsupport/event-loop.cc
+++ b/gdbsupport/event-loop.cc
@@ -492,65 +492,61 @@ handle_file_event (file_handler *file_ptr, int ready_mask)
{
int mask;
+ /* See if the desired events (mask) match the received events
+ (ready_mask). */
+
+#ifdef HAVE_POLL
+ if (use_poll)
{
- {
- /* With poll, the ready_mask could have any of three events
- set to 1: POLLHUP, POLLERR, POLLNVAL. These events
- cannot be used in the requested event mask (events), but
- they can be returned in the return mask (revents). We
- need to check for those event too, and add them to the
- mask which will be passed to the handler. */
+ int error_mask;
- /* See if the desired events (mask) match the received
- events (ready_mask). */
+ /* With poll, the ready_mask could have any of three events set
+ to 1: POLLHUP, POLLERR, POLLNVAL. These events cannot be
+ used in the requested event mask (events), but they can be
+ returned in the return mask (revents). We need to check for
+ those event too, and add them to the mask which will be
+ passed to the handler. */
-#ifdef HAVE_POLL
- if (use_poll)
- {
- int error_mask;
-
- /* POLLHUP means EOF, but can be combined with POLLIN to
- signal more data to read. */
- error_mask = POLLHUP | POLLERR | POLLNVAL;
- mask = ready_mask & (file_ptr->mask | error_mask);
-
- if ((mask & (POLLERR | POLLNVAL)) != 0)
- {
- /* Work in progress. We may need to tell somebody
- what kind of error we had. */
- if (mask & POLLERR)
- warning (_("Error detected on fd %d"), file_ptr->fd);
- if (mask & POLLNVAL)
- warning (_("Invalid or non-`poll'able fd %d"),
- file_ptr->fd);
- file_ptr->error = 1;
- }
- else
- file_ptr->error = 0;
- }
- else
-#endif /* HAVE_POLL */
- {
- if (ready_mask & GDB_EXCEPTION)
- {
- warning (_("Exception condition detected on fd %d"),
- file_ptr->fd);
- file_ptr->error = 1;
- }
- else
- file_ptr->error = 0;
- mask = ready_mask & file_ptr->mask;
- }
+ /* POLLHUP means EOF, but can be combined with POLLIN to
+ signal more data to read. */
+ error_mask = POLLHUP | POLLERR | POLLNVAL;
+ mask = ready_mask & (file_ptr->mask | error_mask);
- /* If there was a match, then call the handler. */
- if (mask != 0)
- {
- event_loop_ui_debug_printf (file_ptr->is_ui,
- "invoking fd file handler `%s`",
- file_ptr->name.c_str ());
- file_ptr->proc (file_ptr->error, file_ptr->client_data);
- }
+ if ((mask & (POLLERR | POLLNVAL)) != 0)
+ {
+ /* Work in progress. We may need to tell somebody
+ what kind of error we had. */
+ if (mask & POLLERR)
+ warning (_("Error detected on fd %d"), file_ptr->fd);
+ if (mask & POLLNVAL)
+ warning (_("Invalid or non-`poll'able fd %d"),
+ file_ptr->fd);
+ file_ptr->error = 1;
+ }
+ else
+ file_ptr->error = 0;
+ }
+ else
+#endif /* HAVE_POLL */
+ {
+ if (ready_mask & GDB_EXCEPTION)
+ {
+ warning (_("Exception condition detected on fd %d"),
+ file_ptr->fd);
+ file_ptr->error = 1;
}
+ else
+ file_ptr->error = 0;
+ mask = ready_mask & file_ptr->mask;
+ }
+
+ /* If there was a match, then call the handler. */
+ if (mask != 0)
+ {
+ event_loop_ui_debug_printf (file_ptr->is_ui,
+ "invoking fd file handler `%s`",
+ file_ptr->name.c_str ());
+ file_ptr->proc (file_ptr->error, file_ptr->client_data);
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-16 18:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-16 18:58 [binutils-gdb] Reindent gdbsupport/event-loop.cc:handle_file_event Pedro Alves
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).