[Spice-devel] [spice-server 2/2] smartcard: Remove duplicate accessor

[Christophe Fergeau]

smartcard_channel_client_get_device() is the same as
smartcard_channel_client_get_char_device(). Let's only keep the latter.
---
 server/smartcard-channel-client.c | 5 -----
 server/smartcard-channel-client.h | 2 --
 server/smartcard.c                | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/server/smartcard-channel-client.c b/server/smartcard-channel-client.c
index 14fea4f..35327dc 100644
--- a/server/smartcard-channel-client.c
+++ b/server/smartcard-channel-client.c
@@ -282,11 +282,6 @@ static void smartcard_channel_client_remove_reader(SmartCardChannelClient *scc,
     }
 }
 
-RedCharDeviceSmartcard* smartcard_channel_client_get_device(SmartCardChannelClient *scc)
-{
-    return scc->priv->smartcard;
-}
-
 static void smartcard_channel_client_write_to_reader(SmartCardChannelClient *scc)
 {
     g_return_if_fail(scc);
diff --git a/server/smartcard-channel-client.h b/server/smartcard-channel-client.h
index 4fe1c72..db29e20 100644
--- a/server/smartcard-channel-client.h
+++ b/server/smartcard-channel-client.h
@@ -83,8 +83,6 @@ void smartcard_channel_client_send_error(RedChannelClient *rcc,
                                          SpiceMarshaller *m,
                                          RedPipeItem *item);
 
-RedCharDeviceSmartcard* smartcard_channel_client_get_device(SmartCardChannelClient *scc);
-
 int smartcard_channel_client_handle_message(RedChannelClient *rcc,
                                             uint16_t type,
                                             uint32_t size,
diff --git a/server/smartcard.c b/server/smartcard.c
index 5b18abe..1a19fa7 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -501,7 +501,7 @@ void smartcard_channel_write_to_reader(RedCharDeviceWriteBuffer *write_buf)
     sin = g_smartcard_readers.sin[vheader->reader_id];
     dev = RED_CHAR_DEVICE_SMARTCARD(sin->st);
     spice_assert(!dev->priv->scc ||
-                 dev == smartcard_channel_client_get_device(dev->priv->scc));
+                 dev == smartcard_channel_client_get_char_device(dev->priv->scc));
     /* protocol requires messages to be in network endianess */
     vheader->type = htonl(vheader->type);
     vheader->length = htonl(vheader->length);
-- 
2.9.3