[PATCH xserver 5/6] kdrive: remove KdSignalWrapper etc.

Adam Jackson ajax at redhat.com
Mon Nov 20 20:43:07 UTC 2017


This no longer does anything useful.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/kdrive/src/kdrive.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 82dcf4ae73..6dbb908565 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -86,8 +86,6 @@ const char *kdGlobalXkbLayout = NULL;
 const char *kdGlobalXkbVariant = NULL;
 const char *kdGlobalXkbOptions = NULL;
 
-static Bool kdCaughtSignal = FALSE;
-
 void
 KdDisableScreen(ScreenPtr pScreen)
 {
@@ -168,9 +166,6 @@ void
 AbortDDX(enum ExitCode error)
 {
     KdDisableScreens();
-
-    if (kdCaughtSignal)
-        OsAbort();
 }
 
 void
@@ -937,13 +932,6 @@ KdAddScreen(ScreenInfo * pScreenInfo,
     AddScreen(KdScreenInit, argc, argv);
 }
 
-static int
-KdSignalWrapper(int signum)
-{
-    kdCaughtSignal = TRUE;
-    return 1;                   /* use generic OS layer cleanup & abort */
-}
-
 void
 KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
@@ -985,8 +973,6 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
         for (screen = card->screenList; screen; screen = screen->next)
             KdAddScreen(pScreenInfo, screen, argc, argv);
 
-    OsRegisterSigWrapper(KdSignalWrapper);
-
 #if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
     if (SeatId) /* Enable input hot-plugging */
         config_pre_init();
-- 
2.14.3



More information about the xorg-devel mailing list