aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/mispans.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
commitc8d69ebaeed8005d38c91613ab699747f45b2228 (patch)
treecd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/mi/mispans.c
parent105cd2be6dfce3579cb585a8d78f655f19cef57b (diff)
parent4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff)
downloadnx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/mi/mispans.c')
-rw-r--r--nx-X11/programs/Xserver/mi/mispans.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/mi/mispans.c b/nx-X11/programs/Xserver/mi/mispans.c
index a8762d323..c731f2a03 100644
--- a/nx-X11/programs/Xserver/mi/mispans.c
+++ b/nx-X11/programs/Xserver/mi/mispans.c
@@ -462,12 +462,12 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup)
ysizes[index] * sizeof(int));
if (!newpoints || !newwidths)
{
- int i;
+ int k;
- for (i = 0; i < ylength; i++)
+ for (k = 0; k < ylength; k++)
{
- free (yspans[i].points);
- free (yspans[i].widths);
+ free (yspans[k].points);
+ free (yspans[k].widths);
}
free (yspans);
free (ysizes);
@@ -494,8 +494,6 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup)
widths = (int *) malloc(count * sizeof(int));
if (!points || !widths)
{
- int i;
-
for (i = 0; i < ylength; i++)
{
free (yspans[i].points);