From eff5e83936a3fda970ef3576d7fb1990f03ac3f9 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Fri, 18 Dec 2015 11:15:13 +0000 Subject: [PATCH] channel: simplify red_channel_client_send_item Acked-by: Pavel Grunt Acked-by: Victor Toso --- server/red-channel.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/server/red-channel.c b/server/red-channel.c index 704f3192..306c87dc 100644 --- a/server/red-channel.c +++ b/server/red-channel.c @@ -560,33 +560,26 @@ static void red_channel_client_send_ping(RedChannelClient *rcc) static void red_channel_client_send_item(RedChannelClient *rcc, PipeItem *item) { - int handled = TRUE; - spice_assert(red_channel_client_no_item_being_sent(rcc)); red_channel_client_reset_send_data(rcc); switch (item->type) { case PIPE_ITEM_TYPE_SET_ACK: red_channel_client_send_set_ack(rcc); - free(item); break; case PIPE_ITEM_TYPE_MIGRATE: red_channel_client_send_migrate(rcc); - free(item); break; case PIPE_ITEM_TYPE_EMPTY_MSG: red_channel_client_send_empty_msg(rcc, item); - free(item); break; case PIPE_ITEM_TYPE_PING: red_channel_client_send_ping(rcc); - free(item); break; default: - handled = FALSE; - } - if (!handled) { - rcc->channel->channel_cbs.send_item(rcc, item); + rcc->channel->channel_cbs.send_item(rcc, item); + return; } + free(item); } static void red_channel_client_release_item(RedChannelClient *rcc, PipeItem *item, int item_pushed)