empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: Inline ring_to_file() into new send_input()

Browse source 
In preparation for the next commit.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-06-25 10:27:48 +02:00
parent 53c8794ef8
commit 26372eb85d
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/client/play.c
View file

@ -448,6 +448,21 @@ recv_input(int fd, struct ring *inbuf)
return res;
}
static int
send_input(int fd, struct ring *inbuf)
{
struct iovec iov[2];
int cnt;
ssize_t res;
cnt = ring_to_iovec(inbuf, iov);
res = writev(fd, iov, cnt);
if (res < 0)
return res;
ring_discard(inbuf, res);
return res;
}
static void
intr(int sig)
{
@ -562,7 +577,7 @@ play(int sock)
/* send it to the server */
if (FD_ISSET(sock, &wrfd)) {
n = ring_to_file(&inbuf, sock);
n = send_input(sock, &inbuf);
if (n < 0) {
perror("write socket");
return -1;