[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/sun Merge AbortDDX() into...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/0e6f1f81cb5f
branches:  trunk
changeset: 7114:0e6f1f81cb5f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 16 00:02:18 2022 +0000

description:
Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c |  21 ++--------
 external/mit/xorg-server/dist/hw/sun/sunIo.c            |  33 ++++++----------
 2 files changed, 16 insertions(+), 38 deletions(-)

diffs (97 lines):

diff -r 06b982b39c2f -r 0e6f1f81cb5f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Fri Jul 15 19:10:11 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Sat Jul 16 00:02:18 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.12 2022/07/16 00:02:18 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -182,14 +182,14 @@
 }
 
 /*-------------------------------------------------------------------------
- * function "AbortDDX"                                 [ called by OS ]
+ * function "ddxGiveUp"                                 [ called by DIX ]
  *
  *  purpose:  free signal handler and close frame buffers
  *  argument: ExitCode
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
-static void
-AbortDDX(enum ExitCode error)
+void
+ddxGiveUp(enum ExitCode error)
 {
     int i;
     X68kScreenRec *screen;
@@ -208,19 +208,6 @@
 }
 
 /*-------------------------------------------------------------------------
- * function "ddxGiveUp"                                 [ called by DIX ]
- *
- *  purpose:  do nothing but call AbortDDX.
- *  argument: nothing
- *  returns:  nothing
- *-----------------------------------------------------------------------*/
-void
-ddxGiveUp(enum ExitCode error)
-{
-    AbortDDX(error);
-}
-
-/*-------------------------------------------------------------------------
  * function "ddxProcessArgument"                        [ called by OS ]
  *
  *  purpose:  process X68k dependent arguments
diff -r 06b982b39c2f -r 0e6f1f81cb5f external/mit/xorg-server/dist/hw/sun/sunIo.c
--- a/external/mit/xorg-server/dist/hw/sun/sunIo.c      Fri Jul 15 19:10:11 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunIo.c      Sat Jul 16 00:02:18 2022 +0000
@@ -155,11 +155,18 @@
     }
 }
 
-/*
- * DDX - specific abort routine.  Called by AbortServer().
- */
-static void
-AbortDDX(enum ExitCode error)
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+    the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
+/* Called by AbortServer(). */
+void
+ddxGiveUp(enum ExitCode error)
 {
     int                i;
     ScreenPtr  pScreen;
@@ -185,22 +192,6 @@
     LogClose(error);
 }
 
-#if INPUTTHREAD
-/** This function is called in Xserver/os/inputthread.c when starting
-    the input thread. */
-void
-ddxInputThreadInit(void)
-{
-}
-#endif
-
-/* Called by GiveUp(). */
-void
-ddxGiveUp(enum ExitCode error)
-{
-    AbortDDX(error);
-}
-
 int
 ddxProcessArgument(int argc, char *argv[], int i)
 {