diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-15 10:11:08 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-15 10:59:28 +0100 |
| commit | 1e2018ce831654f5bf649c5ae4d2e9b003c5a52e (patch) | |
| tree | 3b9a26135f1a2598f0dcf77f72ea2beb7cb59162 /src/ClientWrite.cxx | |
| parent | 3fcf17cb79c1bbec631c1a440eb05953ece87b0d (diff) | |
Client: move connection functions into the class
Diffstat (limited to 'src/ClientWrite.cxx')
| -rw-r--r-- | src/ClientWrite.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ClientWrite.cxx b/src/ClientWrite.cxx index 825029fb..1fe0e7bb 100644 --- a/src/ClientWrite.cxx +++ b/src/ClientWrite.cxx @@ -49,13 +49,13 @@ client_write_deferred_buffer(Client *client, case G_IO_STATUS_EOF: /* client has disconnected */ - client_set_expired(client); + client->SetExpired(); return 0; case G_IO_STATUS_ERROR: /* I/O error */ - client_set_expired(client); + client->SetExpired(); g_warning("failed to flush buffer for %i: %s", client->num, error->message); g_error_free(error); @@ -126,7 +126,7 @@ client_defer_output(Client *client, const void *data, size_t length) (unsigned long)client->deferred_bytes, (unsigned long)client_max_output_buffer_size); /* cause client to close */ - client_set_expired(client); + client->SetExpired(); return; } @@ -160,13 +160,13 @@ client_write_direct(Client *client, const char *data, size_t length) case G_IO_STATUS_EOF: /* client has disconnected */ - client_set_expired(client); + client->SetExpired(); return; case G_IO_STATUS_ERROR: /* I/O error */ - client_set_expired(client); + client->SetExpired(); g_warning("failed to write to %i: %s", client->num, error->message); g_error_free(error); @@ -184,14 +184,14 @@ client_write_direct(Client *client, const char *data, size_t length) void client_write_output(Client *client) { - if (client_is_expired(client) || !client->send_buf_used) + if (client->IsExpired() || !client->send_buf_used) return; if (!g_queue_is_empty(client->deferred_send)) { client_defer_output(client, client->send_buf, client->send_buf_used); - if (client_is_expired(client)) + if (client->IsExpired()) return; /* try to flush the deferred buffers now; the current @@ -216,10 +216,10 @@ static void client_write(Client *client, const char *buffer, size_t buflen) { /* if the client is going to be closed, do nothing */ - if (client_is_expired(client)) + if (client->IsExpired()) return; - while (buflen > 0 && !client_is_expired(client)) { + while (buflen > 0 && !client->IsExpired()) { size_t copylen; assert(client->send_buf_used < sizeof(client->send_buf)); |