pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-29 08:47:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

display-channel: current_remove: rename inner variable 'container'

Browse Source 
It shadows the outer one.

Renamed also the outer 'container' variable.

Signed-off-by: Uri Lublin <uril@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Uri Lublin 2016-12-06 18:06:26 +02:00 committed by Frediano Ziglio
parent 030ae7bbdc
commit a286da42d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/display-channel.c
View File

@ -428,7 +428,7 @@ static void current_remove(DisplayChannel *display, TreeItem *item)
/* depth-first tree traversal, TODO: do a to tree_foreach()? */
for (;;) {
Container *container = now->container;
Container *container_of_now = now->container;
RingItem *ring_item;
if (now->type == TREE_ITEM_TYPE_DRAWABLE) {
@ -437,25 +437,25 @@ static void current_remove(DisplayChannel *display, TreeItem *item)
drawable_remove_from_pipes(drawable);
current_remove_drawable(display, drawable);
} else {
Container *container = CONTAINER(now);
Container *now_as_container = CONTAINER(now);
spice_assert(now->type == TREE_ITEM_TYPE_CONTAINER);
if ((ring_item = ring_get_head(&container->items))) {
if ((ring_item = ring_get_head(&now_as_container->items))) {
now = SPICE_CONTAINEROF(ring_item, TreeItem, siblings_link);
continue;
}
ring_item = now->siblings_link.prev;
container_free(container);
container_free(now_as_container);
}
if (now == item) {
return;
}
if ((ring_item = ring_next(&container->items, ring_item))) {
if ((ring_item = ring_next(&container_of_now->items, ring_item))) {
now = SPICE_CONTAINEROF(ring_item, TreeItem, siblings_link);
} else {
now = &container->base;
now = &container_of_now->base;
}
}
}