summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2011-12-12 16:52:28 +0000
committerMarc-André Lureau <marcandre.lureau@redhat.com>2012-01-09 18:57:57 +0100
commit4eb78d39c5acd33e419a6d9203557d309e3d7873 (patch)
tree92124552e96eee66248fed5b1563ae485f586914
parent3435df1234a8bd3cca25ffd7e4b48f2142267a1c (diff)
downloadspice-4eb78d39c5acd33e419a6d9203557d309e3d7873.tar.gz
spice-4eb78d39c5acd33e419a6d9203557d309e3d7873.tar.xz
spice-4eb78d39c5acd33e419a6d9203557d309e3d7873.zip
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>
-rw-r--r--server/reds.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/server/reds.c b/server/reds.c
index acd8495f..10ebf193 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -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);
}