pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-01 04:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

red-channel-client: Reduce indentation of some code

Browse Source 
Just a style change, return earlier to avoid some indentation.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-05-22 05:10:33 +01:00
parent 5fb4f52bdb
commit 2e357a9b7b
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/red-channel-client.c
View File

@ -690,25 +690,21 @@ static void red_channel_client_ping_timer(void *opaque)
red_channel_client_cancel_ping_timer(rcc);
#ifdef HAVE_LINUX_SOCKIOS_H /* SIOCOUTQ is a Linux only ioctl on sockets. */
{
int so_unsent_size = 0;
int so_unsent_size = 0;
/* retrieving the occupied size of the socket's tcp snd buffer (unacked + unsent) */
if (ioctl(rcc->priv->stream->socket, SIOCOUTQ, &so_unsent_size) == -1) {
red_channel_warning(red_channel_client_get_channel(rcc),
"ioctl(SIOCOUTQ) failed, %s", strerror(errno));
}
if (so_unsent_size > 0) {
/* tcp snd buffer is still occupied. rescheduling ping */
red_channel_client_start_ping_timer(rcc, PING_TEST_IDLE_NET_TIMEOUT_MS);
} else {
red_channel_client_push_ping(rcc);
}
/* retrieving the occupied size of the socket's tcp snd buffer (unacked + unsent) */
if (ioctl(rcc->priv->stream->socket, SIOCOUTQ, &so_unsent_size) == -1) {
red_channel_warning(red_channel_client_get_channel(rcc),
"ioctl(SIOCOUTQ) failed, %s", strerror(errno));
}
#else /* ifdef HAVE_LINUX_SOCKIOS_H */
if (so_unsent_size > 0) {
/* tcp snd buffer is still occupied. rescheduling ping */
red_channel_client_start_ping_timer(rcc, PING_TEST_IDLE_NET_TIMEOUT_MS);
return;
}
#endif /* ifdef HAVE_LINUX_SOCKIOS_H */
/* More portable alternative code path (less accurate but avoids bogus ioctls)*/
red_channel_client_push_ping(rcc);
#endif /* ifdef HAVE_LINUX_SOCKIOS_H */
}
static inline int red_channel_client_waiting_for_ack(RedChannelClient *rcc)
@ -1140,16 +1136,13 @@ static int red_peer_receive(RedStream *stream, uint8_t *buf, uint32_t size)
break;
} else if (errno == EINTR) {
continue;
} else if (errno == EPIPE) {
return -1;
} else {
} else if (errno != EPIPE) {
g_warning("%s", strerror(errno));
return -1;
}
} else {
size -= now;
pos += now;
return -1;
}
size -= now;
pos += now;
}
return pos - buf;
}