more clear code?
This commit is contained in:
parent
d658612cac
commit
d3ff019f53
1 changed files with 4 additions and 3 deletions
|
@ -182,7 +182,7 @@ static GSList* area_remove(GSList *list, Rect *a)
|
||||||
|
|
||||||
if (!RECT_INTERSECTS_RECT(*r, *a)) {
|
if (!RECT_INTERSECTS_RECT(*r, *a)) {
|
||||||
result = g_slist_prepend(result, r);
|
result = g_slist_prepend(result, r);
|
||||||
r = NULL; /* dont free it */
|
/* dont free r, it's moved to the result list */
|
||||||
} else {
|
} else {
|
||||||
Rect isect, extra;
|
Rect isect, extra;
|
||||||
|
|
||||||
|
@ -217,9 +217,10 @@ static GSList* area_remove(GSList *list, Rect *a)
|
||||||
r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
|
r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
|
||||||
result = area_add(result, &extra);
|
result = area_add(result, &extra);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
g_free(r);
|
/* 'r' is not being added to the result list, so free it */
|
||||||
|
g_free(r);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
g_slist_free(list);
|
g_slist_free(list);
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in a new issue