>
> Explicitly pass RedClient* as first argument to this function, to mirror
> red_client_add_channel(). This will eventually allow us to separate the
> implementations of RedClient and RedChannelClient so that they don't
> need to be poking into the internals of each other's structs.
I quite disagree. Unless you could remove client field from RedChannelClient
I don't see the point of having red_client_add_channel and
red_client_remove_channel having the same prototype.
Frediano
> ---
> server/red-channel.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/server/red-channel.c b/server/red-channel.c
> index fbe00fc..2bcf919 100644
> --- a/server/red-channel.c
> +++ b/server/red-channel.c
> @@ -74,7 +74,7 @@ static void
> red_channel_client_restart_ping_timer(RedChannelClient *rcc);
>
> static void red_channel_client_event(int fd, int event, void *data);
> static void red_client_add_channel(RedClient *client, RedChannelClient
> *rcc);
> -static void red_client_remove_channel(RedChannelClient *rcc);
> +static void red_client_remove_channel(RedClient *client, RedChannelClient
> *rcc);
> static RedChannelClient *red_client_get_channel(RedClient *client, int type,
> int id);
> static void red_channel_client_restore_main_sender(RedChannelClient *rcc);
> static inline int red_channel_client_waiting_for_ack(RedChannelClient *rcc);
> @@ -1271,7 +1271,7 @@ void red_channel_client_destroy(RedChannelClient *rcc)
> {
> rcc->destroying = 1;
> red_channel_client_disconnect(rcc);
> - red_client_remove_channel(rcc);
> + red_client_remove_channel(rcc->client, rcc);
> red_channel_client_unref(rcc);
> }
>
> @@ -1822,12 +1822,13 @@ static void
> red_channel_remove_client(RedChannelClient *rcc)
> // TODO: should we set rcc->channel to NULL???
> }
>
> -static void red_client_remove_channel(RedChannelClient *rcc)
> +static void red_client_remove_channel(RedClient *client, RedChannelClient
> *rcc)
> {
> - pthread_mutex_lock(&rcc->client->lock);
> + g_return_if_fail(client == rcc->client);
> + pthread_mutex_lock(&client->lock);
> ring_remove(&rcc->client_link);
> - rcc->client->channels_num--;
> - pthread_mutex_unlock(&rcc->client->lock);
> + client->channels_num--;
> + pthread_mutex_unlock(&client->lock);
> }
>
> static void red_channel_client_disconnect_dummy(RedChannelClient *rcc)
> --
> 2.4.11
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel