diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
| commit | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (patch) | |
| tree | f4a96a254237696f58d46c150c12f289e5a15701 /xorg-server/hw/kdrive/ephyr/hostx.c | |
| parent | ea5824c767121c3c97f587a9dfb63a87b442032b (diff) | |
| download | vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.gz vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.bz2 vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.zip | |
xserver git update 14/6/2010
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/hostx.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/hostx.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c index 0f03004ed..648368124 100644 --- a/xorg-server/hw/kdrive/ephyr/hostx.c +++ b/xorg-server/hw/kdrive/ephyr/hostx.c @@ -669,11 +669,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);
}
@@ -1160,10 +1157,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 ;
@@ -1292,10 +1287,8 @@ hostx_set_window_bounding_rectangles (int a_window, rects, a_num_rects, ShapeSet, YXBanded) ;
is_ok = TRUE ;
- if (rects) {
- free (rects) ;
- rects = NULL ;
- }
+ free(rects);
+ rects = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok;
}
@@ -1329,10 +1322,8 @@ hostx_set_window_clipping_rectangles (int a_window, rects, a_num_rects, ShapeSet, YXBanded) ;
is_ok = TRUE ;
- if (rects) {
- free (rects) ;
- rects = NULL ;
- }
+ free(rects);
+ rects = NULL;
EPHYR_LOG ("leave\n") ;
return is_ok;
}
|