[Spice-devel] [PATCH spice-gtk 1/2] channels-smartcard, cleanup: remove test for impossible condition

Hans de Goede hdegoede at redhat.com
Sat Dec 3 06:00:22 PST 2011


There is only one caller of smartcard_message_complete_in_flight() and
that caller already checks that priv->in_flight_message != NULL, as
it dereferences the priv->in_flight_message pointer.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 gtk/channel-smartcard.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/gtk/channel-smartcard.c b/gtk/channel-smartcard.c
index f376e53..04815a3 100644
--- a/gtk/channel-smartcard.c
+++ b/gtk/channel-smartcard.c
@@ -264,11 +264,6 @@ smartcard_message_new(VSCMsgType msg_type, SpiceMsgOut *msg_out)
 static void
 smartcard_message_complete_in_flight(SpiceSmartcardChannel *channel)
 {
-    if (channel->priv->in_flight_message == NULL) {
-        g_return_if_fail(g_queue_is_empty(channel->priv->message_queue));
-        return;
-    }
-
     smartcard_message_free(channel->priv->in_flight_message);
     channel->priv->in_flight_message = g_queue_pop_head(channel->priv->message_queue);
     if (channel->priv->in_flight_message != NULL)
-- 
1.7.7.4



More information about the Spice-devel mailing list