summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-02-28 12:34:49 -0500
committerAdam Jackson <ajax@redhat.com>2014-10-08 10:10:39 +0200
commit7ebf480f5eb75e06271ec924769e51bdcbbdc69c (patch)
tree90fb3f407fe8345615fa4b669bc5fc6e5f17be13
parent3689be96ac125c9bfca9d37de4878f05f4e2f584 (diff)
xfree86: Remove some can't-happen printf from xf86CreateRootWindowdead-code
Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/common/xf86Init.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 7686294c8..017dcb6bb 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -308,14 +308,6 @@ xf86CreateRootWindow(WindowPtr pWin)
DebugF("xf86CreateRootWindow(%p)\n", pWin);
- if (pScreen->CreateWindow != xf86CreateRootWindow) {
- /* Can't find hook we are hung on */
- xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */ ,
- "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",
- (void *) xf86CreateRootWindow,
- (void *) pScreen->CreateWindow);
- }
-
/* Unhook this function ... */
pScreen->CreateWindow = create_window;
dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
@@ -343,15 +335,8 @@ xf86CreateRootWindow(WindowPtr pWin)
ret &= (err == Success);
}
- else {
- xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
- "non-root window %p (parent %p)\n",
- (void *) pWin, (void *) pWin->parent);
- ret = FALSE;
- }
}
- DebugF("xf86CreateRootWindow() returns %d\n", ret);
return ret;
}