[PATCH xserver 6/6] os: Remove unused OsRegisterSigWrapper

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 include/os.h |  3 ---
 os/osinit.c  | 19 -------------------
 2 files changed, 22 deletions(-)

diff --git a/include/os.h b/include/os.h
index e141a6b02c..593c784753 100644
--- a/include/os.h
+++ b/include/os.h
@@ -297,12 +297,9 @@ _X_ATTRIBUTE_PRINTF(1, 0)
     _X_DEPRECATED;
 
 typedef void (*OsSigHandlerPtr) (int /* sig */ );
-typedef int (*OsSigWrapperPtr) (int /* sig */ );
 
 extern _X_EXPORT OsSigHandlerPtr
 OsSignal(int /* sig */ , OsSigHandlerPtr /* handler */ );
-extern _X_EXPORT OsSigWrapperPtr
-OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
 
 extern _X_EXPORT int auditTrailLevel;
 
diff --git a/os/osinit.c b/os/osinit.c
index 8575319fff..bf5b4b58af 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -88,18 +88,6 @@ int limitNoFile = -1;
 /* The actual user defined max number of clients */
 int LimitClients = LIMITCLIENTS;
 
-static OsSigWrapperPtr OsSigWrapper = NULL;
-
-OsSigWrapperPtr
-OsRegisterSigWrapper(OsSigWrapperPtr newSigWrapper)
-{
-    OsSigWrapperPtr oldSigWrapper = OsSigWrapper;
-
-    OsSigWrapper = newSigWrapper;
-
-    return oldSigWrapper;
-}
-
 /*
  * OsSigHandler --
  *    Catch unexpected signals and exit or continue cleanly.
@@ -124,13 +112,6 @@ OsSigHandler(int signo)
     }
 #endif                          /* RTLD_DI_SETSIGNAL */
 
-    if (OsSigWrapper != NULL) {
-        if (OsSigWrapper(signo) == 0) {
-            /* ddx handled signal and wants us to continue */
-            return;
-        }
-    }
-
     /* log, cleanup, and abort */
     xorg_backtrace();
 
-- 
2.14.3