From 3fc8d6ab9a81a4080e8e4413243956f37ccb0b4d Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 12 Nov 2015 22:09:30 +0000 Subject: worker: simplify red_marshall_image Remove some nested blocks using else if. Signed-off-by: Frediano Ziglio Acked-by: Pavel Grunt --- server/red_worker.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/server/red_worker.c b/server/red_worker.c index 73faeee4..1af3547e 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -6846,27 +6846,23 @@ static void red_marshall_image(RedChannelClient *rcc, SpiceMarshaller *m, ImageI comp_succeeded = red_jpeg_compress_image(dcc, &red_image, &bitmap, &comp_send_data, worker->mem_slots.internal_groupslot_id); - } else { - if (quic_comp) { - comp_succeeded = red_quic_compress_image(dcc, &red_image, &bitmap, - &comp_send_data, - worker->mem_slots.internal_groupslot_id); - } else { + } else if (quic_comp) { + comp_succeeded = red_quic_compress_image(dcc, &red_image, &bitmap, + &comp_send_data, + worker->mem_slots.internal_groupslot_id); #ifdef USE_LZ4 - if (comp_mode == SPICE_IMAGE_COMPRESSION_LZ4 && - bitmap_fmt_is_rgb(bitmap.format) && - red_channel_client_test_remote_cap(&dcc->common.base, - SPICE_DISPLAY_CAP_LZ4_COMPRESSION)) { - comp_succeeded = red_lz4_compress_image(dcc, &red_image, &bitmap, - &comp_send_data, - worker->mem_slots.internal_groupslot_id); - } else + } else if (comp_mode == SPICE_IMAGE_COMPRESSION_LZ4 && + bitmap_fmt_is_rgb(bitmap.format) && + red_channel_client_test_remote_cap(&dcc->common.base, + SPICE_DISPLAY_CAP_LZ4_COMPRESSION)) { + comp_succeeded = red_lz4_compress_image(dcc, &red_image, &bitmap, + &comp_send_data, + worker->mem_slots.internal_groupslot_id); #endif - if (comp_mode != SPICE_IMAGE_COMPRESSION_OFF) - comp_succeeded = red_lz_compress_image(dcc, &red_image, &bitmap, - &comp_send_data, - worker->mem_slots.internal_groupslot_id); - } + } else if (comp_mode != SPICE_IMAGE_COMPRESSION_OFF) { + comp_succeeded = red_lz_compress_image(dcc, &red_image, &bitmap, + &comp_send_data, + worker->mem_slots.internal_groupslot_id); } surface_lossy_region = &dcc->surface_client_lossy_region[item->surface_id]; -- cgit