aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/ephyr
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
committermarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
commite2eb44705a8e4886d81b75c12e68aaebe9946439 (patch)
tree00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/hw/kdrive/ephyr
parent2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff)
parent0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff)
downloadvcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr')
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c6
-rw-r--r--xorg-server/hw/kdrive/ephyr/hostx.c25
2 files changed, 10 insertions, 21 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index da573dacb..2b81c276c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -831,10 +831,8 @@ out:
XFreeGC (dpy, gc) ;
gc = NULL ;
}
- if (rects) {
- free (rects) ;
- rects = NULL ;
- }
+ free(rects);
+ rects = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok ;
}
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 4eb9cc1c0..320541f82 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -683,11 +683,8 @@ hostx_screen_init (EphyrScreenInfo screen,
}
else
{
- if (host_screen->ximg->data)
- {
- free(host_screen->ximg->data);
- host_screen->ximg->data = NULL;
- }
+ free(host_screen->ximg->data);
+ host_screen->ximg->data = NULL;
XDestroyImage(host_screen->ximg);
}
@@ -1186,10 +1183,8 @@ out:
XFree (visuals) ;
visuals = NULL;
}
- if (host_visuals) {
- free (host_visuals) ;
- host_visuals = NULL;
- }
+ free(host_visuals);
+ host_visuals = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok ;
@@ -1322,10 +1317,8 @@ hostx_set_window_bounding_rectangles (int a_window,
#endif
is_ok = TRUE ;
- if (rects) {
- free (rects) ;
- rects = NULL ;
- }
+ free(rects);
+ rects = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok;
}
@@ -1363,10 +1356,8 @@ hostx_set_window_clipping_rectangles (int a_window,
#endif
is_ok = TRUE ;
- if (rects) {
- free (rects) ;
- rects = NULL ;
- }
+ free(rects);
+ rects = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok;
}