[Spice-devel] [PATCH 04/18] display: replace some dubious asserts

Frediano Ziglio fziglio at redhat.com
Tue Nov 24 03:13:11 PST 2015


From: Marc-André Lureau <marcandre.lureau at gmail.com>

Reviewed-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 server/display-channel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/display-channel.c b/server/display-channel.c
index 5e75019..a178cc9 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -861,10 +861,10 @@ int display_channel_wait_for_migrate_data(DisplayChannel *display)
     RedChannelClient *rcc;
 
     spice_debug(NULL);
-    spice_assert(channel->clients_num == 1);
+    spice_warn_if_fail(channel->clients_num == 1);
 
     rcc = SPICE_CONTAINEROF(ring_get_head(&channel->clients), RedChannelClient, channel_link);
-    spice_assert(red_channel_client_waits_for_migrate_data(rcc));
+    spice_return_val_if_fail(red_channel_client_waits_for_migrate_data(rcc), FALSE);
 
     for (;;) {
         red_channel_client_receive(rcc);
-- 
2.4.3



More information about the Spice-devel mailing list