projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eleminate unnecessary variables
[pspp]
/
src
/
output
/
render.c
diff --git
a/src/output/render.c
b/src/output/render.c
index 450d5de7ef241b8f43caaa116c2c64ad870dc382..094e68799cf93b7e72be846075f8e04da80ec499 100644
(file)
--- a/
src/output/render.c
+++ b/
src/output/render.c
@@
-778,6
+778,7
@@
render_page_unref (struct render_page *page)
{
if (page != NULL && --page->ref_cnt == 0)
{
{
if (page != NULL && --page->ref_cnt == 0)
{
+ int i;
struct render_overflow *overflow, *next;
HMAP_FOR_EACH_SAFE (overflow, next, struct render_overflow, node,
struct render_overflow *overflow, *next;
HMAP_FOR_EACH_SAFE (overflow, next, struct render_overflow, node,
@@
-786,8
+787,13
@@
render_page_unref (struct render_page *page)
hmap_destroy (&page->overflows);
table_unref (page->table);
hmap_destroy (&page->overflows);
table_unref (page->table);
- free (page->cp[H]);
- free (page->cp[V]);
+
+ for (i = 0; i < TABLE_N_AXES; ++i)
+ {
+ free (page->join_crossing[i]);
+ free (page->cp[i]);
+ }
+
free (page);
}
}
free (page);
}
}
@@
-1051,7
+1057,10
@@
void
render_break_destroy (struct render_break *b)
{
if (b != NULL)
render_break_destroy (struct render_break *b)
{
if (b != NULL)
- render_page_unref (b->page);
+ {
+ render_page_unref (b->page);
+ b->page = NULL;
+ }
}
/* Returns true if B still has cells that are yet to be returned,
}
/* Returns true if B still has cells that are yet to be returned,
@@
-1203,7
+1212,7
@@
render_page_select (const struct render_page *page, enum table_axis axis,
if (z0 == page->h[a][0] && p0 == 0
&& z1 == page->n[a] - page->h[a][1] && p1 == 0)
{
if (z0 == page->h[a][0] && p0 == 0
&& z1 == page->n[a] - page->h[a][1] && p1 == 0)
{
- struct render_page *page_rw =
(struct render_page *) page
;
+ struct render_page *page_rw =
CONST_CAST (struct render_page *, page)
;
page_rw->ref_cnt++;
return page_rw;
}
page_rw->ref_cnt++;
return page_rw;
}
@@
-1390,4
+1399,3
@@
insert_overflow (struct render_page_selection *s,
return of;
}
return of;
}
-