[Spice-commits] 2 commits - server/reds.c server/stream.c
Frediano Ziglio
fziglio at kemper.freedesktop.org
Wed Jul 13 10:23:39 UTC 2016
server/reds.c | 4 ++--
server/stream.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 787e886d32dbb7411dcdea7f0f5e229bdd53ef7a
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Wed Jul 13 08:30:30 2016 +0100
Use fd parameter instead of reading file descriptor from reds
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Uri Lublin <uril at redhat.com>
diff --git a/server/reds.c b/server/reds.c
index 56138e1..6d625de 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2521,7 +2521,7 @@ static void reds_accept_ssl_connection(int fd, int event, void *data)
RedLinkInfo *link;
int socket;
- if ((socket = accept(reds->secure_listen_socket, NULL, 0)) == -1) {
+ if ((socket = accept(fd, NULL, 0)) == -1) {
spice_warning("accept failed, %s", strerror(errno));
return;
}
@@ -2538,7 +2538,7 @@ static void reds_accept(int fd, int event, void *data)
RedsState *reds = data;
int socket;
- if ((socket = accept(reds->listen_socket, NULL, 0)) == -1) {
+ if ((socket = accept(fd, NULL, 0)) == -1) {
spice_warning("accept failed, %s", strerror(errno));
return;
}
commit 67eb0edb62a87ef7c51cf1cdc6e29830f2dd06ea
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Wed Jul 13 08:29:16 2016 +0100
Remove useless return statement
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Uri Lublin <uril at redhat.com>
diff --git a/server/stream.c b/server/stream.c
index a844ce3..985bc71 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -463,7 +463,6 @@ static void display_channel_create_stream(DisplayChannel *display, Drawable *dra
stream->height, stream->dest_area.left, stream->dest_area.top,
stream->dest_area.right, stream->dest_area.bottom,
stream->input_fps);
- return;
}
// returns whether a stream was created
More information about the Spice-commits
mailing list