andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ephyr: Drop is_ok logging.

Browse Source 
The only cases that lead to !is_ok are already EPHYR_LOG_ERROR, and it
fixes set-but-unused compiler warnings.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Eric Anholt 2013-08-17 14:38:08 +02:00
parent 77c7a2014e
commit f1cefe020b
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/kdrive/ephyr/ephyrdriext.c
View File

@ -189,7 +189,6 @@ static void
ephyrDRIMoveWindow(WindowPtr a_win, ephyrDRIMoveWindow(WindowPtr a_win,
int a_x, int a_y, WindowPtr a_siblings, VTKind a_kind) int a_x, int a_y, WindowPtr a_siblings, VTKind a_kind)
{ {
Bool is_ok = FALSE;
ScreenPtr screen = NULL; ScreenPtr screen = NULL;
EphyrDRIScreenPrivPtr screen_priv = NULL; EphyrDRIScreenPrivPtr screen_priv = NULL;
EphyrDRIWindowPrivPtr win_priv = NULL; EphyrDRIWindowPrivPtr win_priv = NULL;
@ -214,18 +213,16 @@ ephyrDRIMoveWindow(WindowPtr a_win,
EPHYR_LOG("window: %p\n", a_win); EPHYR_LOG("window: %p\n", a_win);
if (!a_win->parent) { if (!a_win->parent) {
EPHYR_LOG("cannot move root window\n"); EPHYR_LOG("cannot move root window\n");
is_ok = TRUE; return;
goto out;
} }
win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win); win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
if (!win_priv) { if (!win_priv) {
EPHYR_LOG("not a DRI peered window\n"); EPHYR_LOG("not a DRI peered window\n");
is_ok = TRUE; return;
goto out;
} }
if (!findWindowPairFromLocal(a_win, &pair) || !pair) { if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
EPHYR_LOG_ERROR("failed to get window pair\n"); EPHYR_LOG_ERROR("failed to get window pair\n");
goto out; return;
} }
/*compute position relative to parent window */ /*compute position relative to parent window */
x = a_win->drawable.x - a_win->parent->drawable.x; x = a_win->drawable.x - a_win->parent->drawable.x;
@ -237,11 +234,6 @@ ephyrDRIMoveWindow(WindowPtr a_win,
geo.width = a_win->drawable.width; geo.width = a_win->drawable.width;
geo.height = a_win->drawable.height; geo.height = a_win->drawable.height;
hostx_set_window_geometry(pair->remote, &geo); hostx_set_window_geometry(pair->remote, &geo);
is_ok = TRUE;
out:
EPHYR_LOG("leave. is_ok:%d\n", is_ok);
/*do cleanup here */
} }
static Bool static Bool
@ -297,7 +289,6 @@ ephyrDRIPositionWindow(WindowPtr a_win, int a_x, int a_y)
static void static void
ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y) ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y)
{ {
Bool is_ok = FALSE;
ScreenPtr screen = NULL; ScreenPtr screen = NULL;
EphyrDRIScreenPrivPtr screen_priv = NULL; EphyrDRIScreenPrivPtr screen_priv = NULL;
EphyrDRIWindowPrivPtr win_priv = NULL; EphyrDRIWindowPrivPtr win_priv = NULL;
@ -323,7 +314,6 @@ ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y)
win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win); win_priv = GET_EPHYR_DRI_WINDOW_PRIV(a_win);
if (!win_priv) { if (!win_priv) {
EPHYR_LOG("not a DRI peered window\n"); EPHYR_LOG("not a DRI peered window\n");
is_ok = TRUE;
goto out; goto out;
} }
if (!findWindowPairFromLocal(a_win, &pair) || !pair) { if (!findWindowPairFromLocal(a_win, &pair) || !pair) {
@ -343,9 +333,8 @@ ephyrDRIClipNotify(WindowPtr a_win, int a_x, int a_y)
* push the clipping region of this window * push the clipping region of this window
* to the peer window in the host * to the peer window in the host
*/ */
is_ok = hostx_set_window_bounding_rectangles hostx_set_window_bounding_rectangles
(pair->remote, rects, RegionNumRects(&a_win->clipList)); (pair->remote, rects, RegionNumRects(&a_win->clipList));
is_ok = TRUE;
out: out:
free(rects); free(rects);