[Spice-devel] [PATCH 12/15] Change on_activating_ticketing() to take RedsState arg

[Frediano Ziglio]

> 
> On Wed, 2016-01-20 at 13:25 +0000, Frediano Ziglio wrote:
> > From: Jonathon Jongsma <jjongsma at redhat.com>
> ---
> >  server/reds.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/server/reds.c b/server/reds.c
> > index 91fab12..3f7ee27 100644
> > --- a/server/reds.c
> > +++ b/server/reds.c
> > @@ -2787,7 +2787,7 @@ static void reds_exit(void)
> >  #endif
> >  }
> >  
> > -static inline void on_activating_ticketing(void)
> > +static inline void on_activating_ticketing(RedsState *reds)
> >  {
> >      if (!ticketing_enabled && reds_main_channel_connected(reds)) {
> >          spice_warning("disconnecting");
> > @@ -3616,7 +3616,7 @@ SPICE_GNUC_VISIBLE int
> > spice_server_set_ticket(SpiceServer *s,
> >          }
> >      }
> >  
> > -    on_activating_ticketing();
> > +    on_activating_ticketing(s);
> 
> considering there is an assert reds == s, Ack.
> 
> Pavel
> 

There is already an assert some lines above.
Perhaps would be better if in the previous patches of similar kind
s (local variable) was used instead of reds (the global one) as we
are trying to remove global usage.

But anyway would be the previous patch fix and is going to be fixes
when global reds is removed.

> >      ticketing_enabled = 1;
> >      if (lifetime == 0) {
> >          taTicket.expiration_time = INT_MAX;
> 

Frediano