[Spice-devel] [PATCH spice-gtk 2/9] smartcard_message_complete_in_flight cleanup error checking

[Christophe Fergeau]

ACK

On Wed, Dec 14, 2011 at 03:14:02PM +0100, Hans de Goede wrote:
> smartcard_message_complete_in_flight should never get called if there
> is no message in flight (priv->in_flight_message != NULL).
> 
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>  gtk/channel-smartcard.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/gtk/channel-smartcard.c b/gtk/channel-smartcard.c
> index f376e53..64fc06e 100644
> --- a/gtk/channel-smartcard.c
> +++ b/gtk/channel-smartcard.c
> @@ -264,10 +264,7 @@ 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;
> -    }
> +    g_return_if_fail(channel->priv->in_flight_message != NULL);
>  
>      smartcard_message_free(channel->priv->in_flight_message);
>      channel->priv->in_flight_message = g_queue_pop_head(channel->priv->message_queue);
> -- 
> 1.7.7.4
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20111215/27305908/attachment.pgp>