Merge reds_accept_connection into reds_accept

Neither reds_accept_connection or reds_accept are very long,
so the split is pointless & increases code size for no gain.
Merge them together to reduce code size

* server/reds.c: Merge reds_accept_connection into reds_accept

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2011-12-12 16:52:28 +00:00 committed by Marc-André Lureau
parent 3435df1234
commit 4eb78d39c5

View File

@ -2736,22 +2736,6 @@ error:
return NULL;
}
static RedLinkInfo *reds_accept_connection(int listen_socket)
{
RedLinkInfo *link;
RedsStream *stream;
if (!(link = __reds_accept_connection(listen_socket))) {
return NULL;
}
stream = link->stream;
stream->read = stream_read_cb;
stream->write = stream_write_cb;
stream->writev = stream_writev_cb;
return link;
}
static void reds_accept_ssl_connection(int fd, int event, void *data)
{
@ -2814,12 +2798,18 @@ error:
static void reds_accept(int fd, int event, void *data)
{
RedLinkInfo *link;
RedsStream *stream;
link = reds_accept_connection(reds->listen_socket);
if (link == NULL) {
if (!(link = __reds_accept_connection(reds->listen_socket))) {
red_printf("accept failed");
return;
}
stream = link->stream;
stream->read = stream_read_cb;
stream->write = stream_write_cb;
stream->writev = stream_writev_cb;
reds_handle_new_link(link);
}