diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-27 13:40:52 +0100 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2011-07-21 15:09:26 +0300 |
commit | 584cc5a3d139de92d1a22fb80703a33106967297 (patch) | |
tree | d935a7cd379004eca1af6a41c4479b3ad8684446 /server | |
parent | a5946a54dd54b4a3a72c9683f43b710f3f0b3f11 (diff) | |
download | spice-584cc5a3d139de92d1a22fb80703a33106967297.tar.gz spice-584cc5a3d139de92d1a22fb80703a33106967297.tar.xz spice-584cc5a3d139de92d1a22fb80703a33106967297.zip |
server: remove cb_free, not needed anymore
https://bugs.freedesktop.org/show_bug.cgi?id=34795
Diffstat (limited to 'server')
-rw-r--r-- | server/reds.c | 19 | ||||
-rw-r--r-- | server/reds.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/server/reds.c b/server/reds.c index acbce57a..19da2ae8 100644 --- a/server/reds.c +++ b/server/reds.c @@ -413,14 +413,6 @@ static int reds_read(void *ctx, void *buf, size_t size) return (return_code); } -static int reds_free(RedsStream *peer) -{ - reds_channel_event(peer, SPICE_CHANNEL_EVENT_DISCONNECTED); - close(peer->socket); - free(peer); - return 0; -} - static int reds_ssl_write(void *ctx, void *buf, size_t size) { int return_code; @@ -479,15 +471,6 @@ static int reds_ssl_writev(void *ctx, const struct iovec *vector, int count) return return_code; } -static int reds_ssl_free(RedsStream* peer) -{ - reds_channel_event(peer, SPICE_CHANNEL_EVENT_DISCONNECTED); - SSL_free(peer->ssl); - close(peer->socket); - free(peer); - return 0; -} - static void reds_stream_remove_watch(RedsStream* s) { if (s->watch) { @@ -2879,7 +2862,6 @@ static RedLinkInfo *reds_accept_connection(int listen_socket) peer->cb_read = (int (*)(void *, void *, int))reds_read; peer->cb_write = (int (*)(void *, void *, int))reds_write; peer->cb_writev = (int (*)(void *, const struct iovec *vector, int count))writev; - peer->cb_free = (int (*)(RedsStream *))reds_free; return link; } @@ -2915,7 +2897,6 @@ static void reds_accept_ssl_connection(int fd, int event, void *data) link->peer->cb_write = (int (*)(void *, void *, int))reds_ssl_write; link->peer->cb_read = (int (*)(void *, void *, int))reds_ssl_read; link->peer->cb_writev = reds_ssl_writev; - link->peer->cb_free = (int (*)(RedsStream *))reds_ssl_free; return_code = SSL_accept(link->peer->ssl); if (return_code == 1) { diff --git a/server/reds.h b/server/reds.h index 3ed097cc..2a9a0def 100644 --- a/server/reds.h +++ b/server/reds.h @@ -43,7 +43,6 @@ struct RedsStream { int (*cb_read)(void *, void *, int); int (*cb_writev)(void *, const struct iovec *vector, int count); - int (*cb_free)(struct RedsStream *); /* private */ ssize_t (*read)(RedsStream *s, void *buf, size_t nbyte); |