From d6092f11b69e84e5d088b9feabb972fad705b4f4 Mon Sep 17 00:00:00 2001 From: Uri Lublin Date: Wed, 10 Jul 2013 00:21:40 +0300 Subject: syntax-check: remove trailing whitespaces Only whitespace changes in this commit. --- server/char_device.c | 4 ++-- server/red_parse_qxl.c | 5 ++--- server/red_worker.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/char_device.c b/server/char_device.c index 792ab9c5..660a7884 100644 --- a/server/char_device.c +++ b/server/char_device.c @@ -554,7 +554,7 @@ SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get(SpiceCharDeviceSt RedClient *client, int size) { - return __spice_char_device_write_buffer_get(dev, client, size, + return __spice_char_device_write_buffer_get(dev, client, size, client ? WRITE_BUFFER_ORIGIN_CLIENT : WRITE_BUFFER_ORIGIN_SERVER, 0); } @@ -562,7 +562,7 @@ SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get(SpiceCharDeviceSt SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get_server_no_token( SpiceCharDeviceState *dev, int size) { - return __spice_char_device_write_buffer_get(dev, NULL, size, + return __spice_char_device_write_buffer_get(dev, NULL, size, WRITE_BUFFER_ORIGIN_SERVER_NO_TOKEN, 0); } diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c index 7d4d4a1d..6c0b0658 100644 --- a/server/red_parse_qxl.c +++ b/server/red_parse_qxl.c @@ -663,14 +663,13 @@ static bool get_transform(RedMemSlotInfo *slots, int group_id, QXLPHYSICAL qxl_transform, SpiceTransform *dst_transform) - { const uint32_t *t = NULL; int error; if (qxl_transform == 0) return FALSE; - + t = (uint32_t *)get_virt(slots, qxl_transform, sizeof(*dst_transform), group_id, &error); if (!t || error) @@ -688,7 +687,7 @@ static void red_get_composite_ptr(RedMemSlotInfo *slots, int group_id, red->src_bitmap = red_get_image(slots, group_id, qxl->src, flags, FALSE); if (get_transform(slots, group_id, qxl->src_transform, &red->src_transform)) red->flags |= SPICE_COMPOSITE_HAS_SRC_TRANSFORM; - + if (qxl->mask) { red->mask_bitmap = red_get_image(slots, group_id, qxl->mask, flags, FALSE); red->flags |= SPICE_COMPOSITE_HAS_MASK; diff --git a/server/red_worker.c b/server/red_worker.c index 597008e6..73fe866c 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -11033,7 +11033,7 @@ static void red_wait_all_sent(RedChannel *channel) end_time = red_now() + DETACH_TIMEOUT; red_channel_push(channel); - while (((max_pipe_size = red_channel_max_pipe_size(channel)) || + while (((max_pipe_size = red_channel_max_pipe_size(channel)) || (blocked = red_channel_any_blocked(channel))) && red_now() < end_time) { spice_debug("pipe-size %u blocked %d", max_pipe_size, blocked); @@ -11047,7 +11047,7 @@ static void red_wait_all_sent(RedChannel *channel) spice_printerr("timeout: pending out messages exist (pipe-size %u, blocked %d)", max_pipe_size, blocked); red_channel_apply_clients(channel, rcc_shutdown_if_pending_send); - } else { + } else { spice_assert(red_channel_no_item_being_sent(channel)); } } @@ -11534,7 +11534,7 @@ void handle_dev_stop(void *opaque, void *payload) red_display_clear_glz_drawables(worker->display_channel); flush_all_surfaces(worker); /* todo: when the waiting is expected to take long (slow connection and - * overloaded pipe), don't wait, and in case of migration, + * overloaded pipe), don't wait, and in case of migration, * purge the pipe, send destroy_all_surfaces * to the client (there is no such message right now), and start * from scratch on the destination side */ -- cgit