[Spice-devel] [spice-server 1/3] Remove unused "monitor_latency" arguments

Frediano Ziglio fziglio at redhat.com
Thu Mar 30 17:18:27 UTC 2017


>
> InputsChannelClient::new and SmartcardChannelClient::new both accept a
> "monitor_latency" argument, which is always FALSE. It can be removed.
> 
> Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>

Acked the entire series.

Frediano

> ---
>  server/inputs-channel-client.c    | 2 --
>  server/inputs-channel-client.h    | 1 -
>  server/inputs-channel.c           | 2 +-
>  server/smartcard-channel-client.c | 2 --
>  server/smartcard-channel-client.h | 1 -
>  server/smartcard.c                | 6 +-----
>  6 files changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/server/inputs-channel-client.c b/server/inputs-channel-client.c
> index c5b8e71..c28e24e 100644
> --- a/server/inputs-channel-client.c
> +++ b/server/inputs-channel-client.c
> @@ -83,7 +83,6 @@ inputs_channel_client_init(InputsChannelClient *self)
>  RedChannelClient* inputs_channel_client_create(RedChannel *channel,
>                                                 RedClient *client,
>                                                 RedsStream *stream,
> -                                               int monitor_latency,
>                                                 RedChannelCapabilities *caps)
>  {
>      RedChannelClient *rcc;
> @@ -93,7 +92,6 @@ RedChannelClient* inputs_channel_client_create(RedChannel
> *channel,
>                           "channel", channel,
>                           "client", client,
>                           "stream", stream,
> -                         "monitor-latency", monitor_latency,
>                           "caps", caps,
>                           NULL);
>  
> diff --git a/server/inputs-channel-client.h b/server/inputs-channel-client.h
> index ba08dbf..0cd2ae6 100644
> --- a/server/inputs-channel-client.h
> +++ b/server/inputs-channel-client.h
> @@ -59,7 +59,6 @@ GType inputs_channel_client_get_type(void) G_GNUC_CONST;
>  RedChannelClient* inputs_channel_client_create(RedChannel *channel,
>                                                 RedClient *client,
>                                                 RedsStream *stream,
> -                                               int monitor_latency,
>                                                 RedChannelCapabilities
>                                                 *caps);
>  
>  uint16_t inputs_channel_client_get_motion_count(InputsChannelClient* self);
> diff --git a/server/inputs-channel.c b/server/inputs-channel.c
> index 073dc41..0851821 100644
> --- a/server/inputs-channel.c
> +++ b/server/inputs-channel.c
> @@ -463,7 +463,7 @@ static void inputs_connect(RedChannel *channel, RedClient
> *client,
>      }
>  
>      spice_printerr("inputs channel client create");
> -    rcc = inputs_channel_client_create(channel, client, stream, FALSE,
> caps);
> +    rcc = inputs_channel_client_create(channel, client, stream, caps);
>      if (!rcc) {
>          return;
>      }
> diff --git a/server/smartcard-channel-client.c
> b/server/smartcard-channel-client.c
> index 05ad49b..e934b2e 100644
> --- a/server/smartcard-channel-client.c
> +++ b/server/smartcard-channel-client.c
> @@ -106,7 +106,6 @@ smart_card_channel_client_init(SmartCardChannelClient
> *self)
>  
>  SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
>                                                          RedClient *client,
>                                                          RedsStream *stream,
> -                                                        int monitor_latency,
>                                                          RedChannelCapabilities
>                                                          *caps)
>  {
>      SmartCardChannelClient *rcc;
> @@ -116,7 +115,6 @@ SmartCardChannelClient*
> smartcard_channel_client_create(RedChannel *channel,
>                           "channel", channel,
>                           "client", client,
>                           "stream", stream,
> -                         "monitor-latency", monitor_latency,
>                           "caps", caps,
>                           NULL);
>  
> diff --git a/server/smartcard-channel-client.h
> b/server/smartcard-channel-client.h
> index 612f9f8..f346889 100644
> --- a/server/smartcard-channel-client.h
> +++ b/server/smartcard-channel-client.h
> @@ -57,7 +57,6 @@ GType smart_card_channel_client_get_type(void)
> G_GNUC_CONST;
>  
>  SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
>                                                          RedClient *client,
>                                                          RedsStream *stream,
> -                                                        int monitor_latency,
>                                                          RedChannelCapabilities
>                                                          *caps);
>  
>  bool smartcard_channel_client_handle_migrate_flush_mark(RedChannelClient
>  *rcc);
> diff --git a/server/smartcard.c b/server/smartcard.c
> index fcba01b..ac2fc1e 100644
> --- a/server/smartcard.c
> +++ b/server/smartcard.c
> @@ -535,11 +535,7 @@ static void smartcard_connect_client(RedChannel
> *channel, RedClient *client,
>  
>      SmartCardChannelClient *scc;
>  
> -    scc = smartcard_channel_client_create(channel,
> -                                          client,
> -                                          stream,
> -                                          FALSE,
> -                                          caps);
> +    scc = smartcard_channel_client_create(channel, client, stream, caps);
>  
>      if (!scc) {
>          return;


More information about the Spice-devel mailing list