FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reindent gdbsupport/event-loop.cc:handle_file_event

Browse source 
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
This commit is contained in:
Pedro Alves 2022-05-16 12:20:08 +01:00
parent 36a5b37053
commit 187075ebbc
1 changed files with 49 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
gdbsupport/event-loop.cc
View file

@ -492,65 +492,61 @@ handle_file_event (file_handler *file_ptr, int ready_mask)
{
int 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. */
/* See if the desired events (mask) match the received
events (ready_mask). */
/* See if the desired events (mask) match the received events
(ready_mask). */
#ifdef HAVE_POLL
if (use_poll)
{
int error_mask;
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);
/* 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. */
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);
}
}