[Spice-commits] 7 commits - server/dispatcher.c server/dispatcher.h server/main_channel.c server/main_channel.h server/red_channel.c server/red_channel.h server/red_dispatcher.h
Frediano Ziglio
fziglio at kemper.freedesktop.org
Mon Nov 23 03:53:36 PST 2015
server/dispatcher.c | 13 -------------
server/dispatcher.h | 1 -
server/main_channel.c | 11 -----------
server/main_channel.h | 2 --
server/red_channel.c | 17 -----------------
server/red_channel.h | 4 ----
server/red_dispatcher.h | 1 -
7 files changed, 49 deletions(-)
New commits:
commit cfa022c656c35fe56643ce51b3b54e649cfe2159
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:51 2015 +0100
main channel: Remove unused main_channel_client_get_link_id
It was introduced in 9cece23ba3e49e6eec9e380daa95d6ee0133c91c
but never used.
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/main_channel.c b/server/main_channel.c
index 472ddd6..1af6baa 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -1079,11 +1079,6 @@ static void ping_timer_cb(void *opaque)
}
#endif /* RED_STATISTICS */
-uint32_t main_channel_client_get_link_id(MainChannelClient *mcc)
-{
- return mcc->connection_id;
-}
-
static MainChannelClient *main_channel_client_create(MainChannel *main_chan, RedClient *client,
RedsStream *stream, uint32_t connection_id,
int num_common_caps, uint32_t *common_caps,
diff --git a/server/main_channel.h b/server/main_channel.h
index e7027bc..9bd20f1 100644
--- a/server/main_channel.h
+++ b/server/main_channel.h
@@ -71,7 +71,6 @@ void main_channel_client_push_notify(MainChannelClient *mcc, const char *msg);
void main_channel_push_multi_media_time(MainChannel *main_chan, int time);
int main_channel_getsockname(MainChannel *main_chan, struct sockaddr *sa, socklen_t *salen);
int main_channel_getpeername(MainChannel *main_chan, struct sockaddr *sa, socklen_t *salen);
-uint32_t main_channel_client_get_link_id(MainChannelClient *mcc);
/*
* return TRUE if network test had been completed successfully.
commit e20b44bf519a8b99b7d7f8fd300bae9c27069b72
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:50 2015 +0100
main channel: Remove unused main_channel_push_notify
It is not needed since 8d44aa032892ea6643925fa7485d9af32853e127
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/main_channel.c b/server/main_channel.c
index 176584a..472ddd6 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -579,12 +579,6 @@ void main_channel_push_uuid(MainChannelClient *mcc, const uint8_t uuid[16])
red_channel_client_pipe_add_push(&mcc->base, item);
}
-void main_channel_push_notify(MainChannel *main_chan, const char *msg)
-{
- red_channel_pipes_new_add_push(&main_chan->base,
- main_notify_item_new, (void *)msg);
-}
-
void main_channel_client_push_notify(MainChannelClient *mcc, const char *msg)
{
PipeItem *item = main_notify_item_new(&mcc->base, (void *)msg, 1);
diff --git a/server/main_channel.h b/server/main_channel.h
index d371d79..e7027bc 100644
--- a/server/main_channel.h
+++ b/server/main_channel.h
@@ -67,7 +67,6 @@ void main_channel_client_start_net_test(MainChannelClient *mcc, int test_rate);
void main_channel_push_init(MainChannelClient *mcc, int display_channels_hint,
int current_mouse_mode, int is_client_mouse_allowed, int multi_media_time,
int ram_hint);
-void main_channel_push_notify(MainChannel *main_chan, const char *msg);
void main_channel_client_push_notify(MainChannelClient *mcc, const char *msg);
void main_channel_push_multi_media_time(MainChannel *main_chan, int time);
int main_channel_getsockname(MainChannel *main_chan, struct sockaddr *sa, socklen_t *salen);
commit 70971e99236d4cd32925de5f537f4b278edda80a
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:49 2015 +0100
red channel: Remove unused red_channel_apply_clients_data
It was introduced in 7e8e13593ee681cf04c349bca57dd225d7802494
but never used.
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/red_channel.c b/server/red_channel.c
index c214494..609c83f 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -1936,18 +1936,6 @@ void red_channel_apply_clients(RedChannel *channel, channel_client_callback cb)
}
}
-void red_channel_apply_clients_data(RedChannel *channel, channel_client_callback_data cb, void *data)
-{
- RingItem *link;
- RingItem *next;
- RedChannelClient *rcc;
-
- RING_FOREACH_SAFE(link, next, &channel->clients) {
- rcc = SPICE_CONTAINEROF(link, RedChannelClient, channel_link);
- cb(rcc, data);
- }
-}
-
int red_channel_all_blocked(RedChannel *channel)
{
RingItem *link;
diff --git a/server/red_channel.h b/server/red_channel.h
index 0e0138f..7f2584a 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -560,7 +560,6 @@ uint32_t red_channel_sum_pipes_size(RedChannel *channel);
typedef void (*channel_client_callback)(RedChannelClient *rcc);
typedef void (*channel_client_callback_data)(RedChannelClient *rcc, void *data);
void red_channel_apply_clients(RedChannel *channel, channel_client_callback v);
-void red_channel_apply_clients_data(RedChannel *channel, channel_client_callback_data v, void *data);
struct RedClient {
RingItem link;
commit 96049b7c3a323d923e21c7d3601d1aec0151b6f8
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:48 2015 +0100
red channel: Remove unused declaration of red_channel_pipes_remove
It was introduced in 09ae4700d27b7c1cca64c2ce4c90f0c6cdf81ccf
but never used.
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/red_channel.h b/server/red_channel.h
index 1d6eab9..0e0138f 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -513,8 +513,6 @@ int red_channel_client_send_message_pending(RedChannelClient *rcc);
int red_channel_no_item_being_sent(RedChannel *channel);
int red_channel_client_no_item_being_sent(RedChannelClient *rcc);
-void red_channel_pipes_remove(RedChannel *channel, PipeItem *item);
-
// TODO: unstaticed for display/cursor channels. they do some specific pushes not through
// adding elements or on events. but not sure if this is actually required (only result
// should be that they ""try"" a little harder, but if the event system is correct it
commit 380b9f6aff17b59a5eee919ec8b9dccb4dc07cae
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:47 2015 +0100
red channel: Remove unused red_channel_push_set_ack
It is not needed since 8e7b22b7861d2859167767822f29749bfe3ecc16
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/red_channel.c b/server/red_channel.c
index 2b1ce08..c214494 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -483,11 +483,6 @@ void red_channel_client_push_set_ack(RedChannelClient *rcc)
red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_SET_ACK);
}
-void red_channel_push_set_ack(RedChannel *channel)
-{
- red_channel_pipes_add_type(channel, PIPE_ITEM_TYPE_SET_ACK);
-}
-
static void red_channel_client_send_set_ack(RedChannelClient *rcc)
{
SpiceMsgSetAck ack;
diff --git a/server/red_channel.h b/server/red_channel.h
index 4deecb6..1d6eab9 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -496,7 +496,6 @@ void red_channel_pipes_add_empty_msg(RedChannel *channel, int msg_type);
void red_channel_client_ack_zero_messages_window(RedChannelClient *rcc);
void red_channel_client_ack_set_client_window(RedChannelClient *rcc, int client_window);
void red_channel_client_push_set_ack(RedChannelClient *rcc);
-void red_channel_push_set_ack(RedChannel *channel);
int red_channel_get_first_socket(RedChannel *channel);
commit 2d79b39d966e923bea63dbc9ec9395a17708a49e
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:43 2015 +0100
red dispatcher: Remove unused declaration of red_dispatcher_set_mm_time
It is not used since c541d7e29dc0053e6434d053a50454bb8a7121e9
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/red_dispatcher.h b/server/red_dispatcher.h
index fef067c..9f3474f 100644
--- a/server/red_dispatcher.h
+++ b/server/red_dispatcher.h
@@ -28,7 +28,6 @@ typedef struct AsyncCommand AsyncCommand;
void red_dispatcher_init(QXLInstance *qxl);
-void red_dispatcher_set_mm_time(uint32_t);
void red_dispatcher_on_ic_change(void);
void red_dispatcher_on_sv_change(void);
void red_dispatcher_set_mouse_mode(uint32_t mode);
commit fd1eff352d7aab2a23e0fed52c5898ea7c4af307
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Mon Nov 23 10:43:42 2015 +0100
dispatcher: Remove unused dispatcher_read_message
It is not needed since d3153f861065235c2a7a7120375be5db948c5a77
Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
diff --git a/server/dispatcher.c b/server/dispatcher.c
index 945edba..d6c03ca 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -200,19 +200,6 @@ unlock:
pthread_mutex_unlock(&dispatcher->lock);
}
-uint32_t dispatcher_read_message(Dispatcher *dispatcher)
-{
- uint32_t message = 0;
-
- spice_return_val_if_fail(dispatcher, 0);
- spice_return_val_if_fail(dispatcher->send_fd != -1, 0);
-
- if (read_safe(dispatcher->send_fd, (uint8_t*)&message, sizeof(message), 1) == -1)
- spice_warn_if_reached();
-
- return message;
-}
-
void dispatcher_register_async_done_callback(
Dispatcher *dispatcher,
dispatcher_handle_async_done handler)
diff --git a/server/dispatcher.h b/server/dispatcher.h
index 210e317..b774f61 100644
--- a/server/dispatcher.h
+++ b/server/dispatcher.h
@@ -62,7 +62,6 @@ struct Dispatcher {
*/
void dispatcher_send_message(Dispatcher *dispatcher, uint32_t message_type,
void *payload);
-uint32_t dispatcher_read_message(Dispatcher *dispatcher);
/*
* dispatcher_init
More information about the Spice-commits
mailing list