Skip to content

M
mpd
Commit 32bb19d0 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

client: use client_defer_output() in client_write()

Eliminate duplicated code, call client_defer_output() which we splitted from client_write_output() earlier.
parent 709b795e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/client.c
View file @ 32bb19d0
...@@ -753,22 +753,18 @@ static void client_write(struct client *client, ...@@ -753,22 +753,18 @@ static void client_write(struct client *client,
if ((ret = write(client->fd, data, length)) < 0) { if ((ret = write(client->fd, data, length)) < 0) {
if (errno == EAGAIN || errno == EINTR) { if (errno == EAGAIN || errno == EINTR) {
client->deferred_send = new_sllnode(data, length); client_defer_output(client, data, length);
} else { } else {
DEBUG("client %i: problems writing\n", client->num); DEBUG("client %i: problems writing\n", client->num);
client->expired = 1; client->expired = 1;
return; return;
} }
} else if ((size_t)ret < client->send_buf_used) { } else if ((size_t)ret < client->send_buf_used) {
client->deferred_send = new_sllnode(data + ret, length - ret); client_defer_output(client, data + ret, length - ret);
} }
if (client->deferred_send) { if (client->deferred_send)
DEBUG("client %i: buffer created\n", client->num); DEBUG("client %i: buffer created\n", client->num);
client->deferred_bytes =
client->deferred_send->size
+ sizeof(struct sllnode);
}
} }
static void client_write_output(struct client *client) static void client_write_output(struct client *client)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment