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

[Olivier Fourdan]

On Mon, Nov 20, 2017 at 9:43 PM, Adam Jackson <ajax at redhat.com> wrote:

> 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
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel


LGTM.

Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.x.org/archives/xorg-devel/attachments/20171213/78f84d74/attachment.html>