summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnir sheriber <ssheribe@redhat.com>2016-03-20 15:03:41 +0200
committerPavel Grunt <pgrunt@redhat.com>2016-03-22 11:31:21 +0100
commitd56e64dc301772dddf9bff992b04fcf1e9ce6bdb (patch)
treecb851009cadfaa9c184b87cb95273e5224a28988
parent74a5ef7dcf492542a52be17d6dae5b06446d7bfe (diff)
downloadspice-gtk-d56e64dc301772dddf9bff992b04fcf1e9ce6bdb.tar.gz
spice-gtk-d56e64dc301772dddf9bff992b04fcf1e9ce6bdb.tar.xz
spice-gtk-d56e64dc301772dddf9bff992b04fcf1e9ce6bdb.zip
usbredir_handle_msg: rename data to err_data
To better reflect what this variable is used for and change the declare location such that it will be declared only if it should Acked-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--src/channel-usbredir.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index dc96d09..ab90800 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -629,7 +629,6 @@ static void usbredir_handle_msg(SpiceChannel *c, SpiceMsgIn *in)
{
SpiceUsbredirChannel *channel = SPICE_USBREDIR_CHANNEL(c);
SpiceUsbredirChannelPrivate *priv = channel->priv;
- device_error_data data;
int r, size;
uint8_t *buf;
@@ -645,6 +644,7 @@ static void usbredir_handle_msg(SpiceChannel *c, SpiceMsgIn *in)
r = usbredirhost_read_guest_data(priv->host);
if (r != 0) {
SpiceUsbDevice *spice_device = priv->spice_device;
+ device_error_data err_data;
gchar *desc;
GError *err;
@@ -674,14 +674,14 @@ static void usbredir_handle_msg(SpiceChannel *c, SpiceMsgIn *in)
CHANNEL_DEBUG(c, "%s", err->message);
- data.channel = channel;
- data.caller = coroutine_self();
- data.spice_device = g_boxed_copy(spice_usb_device_get_type(), spice_device);
- data.error = err;
- g_idle_add(device_error, &data);
+ err_data.channel = channel;
+ err_data.caller = coroutine_self();
+ err_data.spice_device = g_boxed_copy(spice_usb_device_get_type(), spice_device);
+ err_data.error = err;
+ g_idle_add(device_error, &err_data);
coroutine_yield(NULL);
- g_boxed_free(spice_usb_device_get_type(), data.spice_device);
+ g_boxed_free(spice_usb_device_get_type(), err_data.spice_device);
g_error_free(err);
}