On Wed, Dec 2, 2015 at 5:19 PM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote:
> From: Yonit Halperin <yhalperi@xxxxxxxxxx>
>
> (1) receive timeout as a parameter.
> (2) add a return value and pass the handling
> of failures to the calling routine.
> ---
> server/red_channel.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/server/red_channel.c b/server/red_channel.c
> index 948d354..737a6b7 100644
> --- a/server/red_channel.c
> +++ b/server/red_channel.c
> @@ -2337,7 +2337,7 @@ int red_channel_client_wait_outgoing_item(RedChannelClient *rcc,
> spice_warning("timeout");
> return FALSE;
> } else {
> - spice_assert(red_channel_client_no_item_being_sent(rcc));
> + spice_warn_if_fail(red_channel_client_no_item_being_sent(rcc));
> return TRUE;
> }
> }
> @@ -2425,4 +2425,6 @@ void red_channel_client_disconnect_if_pending_send(RedChannelClient *rcc)
> } else {
> spice_assert(red_channel_client_no_item_being_sent(rcc));
> }
> +
> + spice_warn_if_fail(red_channel_client_no_item_being_sent(rcc));
> }
> --
> 2.4.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
NAK. This patch got changed a bit from its original version (please,
see: http://cgit.freedesktop.org/~fziglio/spice-server/commit/?h=refactory&id=e78479a3a64d87de2ffa3aee0a481ce51eb28c26
).
If the spice_wanr_if_fail() additions are valid, I would re-write the
commit message. Otherwise the patch can be dropped.
Reviewed-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel