<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Nov 20, 2017 at 9:43 PM, Adam Jackson <span dir="ltr"><<a href="mailto:ajax@redhat.com" target="_blank">ajax@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Adam Jackson <<a href="mailto:ajax@redhat.com">ajax@redhat.com</a>><br>
---<br>
include/os.h | 3 ---<br>
os/osinit.c | 19 -------------------<br>
2 files changed, 22 deletions(-)<br>
<br>
diff --git a/include/os.h b/include/os.h<br>
index e141a6b02c..593c784753 100644<br>
--- a/include/os.h<br>
+++ b/include/os.h<br>
@@ -297,12 +297,9 @@ _X_ATTRIBUTE_PRINTF(1, 0)<br>
_X_DEPRECATED;<br>
<br>
typedef void (*OsSigHandlerPtr) (int /* sig */ );<br>
-typedef int (*OsSigWrapperPtr) (int /* sig */ );<br>
<br>
extern _X_EXPORT OsSigHandlerPtr<br>
OsSignal(int /* sig */ , OsSigHandlerPtr /* handler */ );<br>
-extern _X_EXPORT OsSigWrapperPtr<br>
-OsRegisterSigWrapper(<wbr>OsSigWrapperPtr newWrap);<br>
<br>
extern _X_EXPORT int auditTrailLevel;<br>
<br>
diff --git a/os/osinit.c b/os/osinit.c<br>
index 8575319fff..bf5b4b58af 100644<br>
--- a/os/osinit.c<br>
+++ b/os/osinit.c<br>
@@ -88,18 +88,6 @@ int limitNoFile = -1;<br>
/* The actual user defined max number of clients */<br>
int LimitClients = LIMITCLIENTS;<br>
<br>
-static OsSigWrapperPtr OsSigWrapper = NULL;<br>
-<br>
-OsSigWrapperPtr<br>
-OsRegisterSigWrapper(<wbr>OsSigWrapperPtr newSigWrapper)<br>
-{<br>
- OsSigWrapperPtr oldSigWrapper = OsSigWrapper;<br>
-<br>
- OsSigWrapper = newSigWrapper;<br>
-<br>
- return oldSigWrapper;<br>
-}<br>
-<br>
/*<br>
* OsSigHandler --<br>
* Catch unexpected signals and exit or continue cleanly.<br>
@@ -124,13 +112,6 @@ OsSigHandler(int signo)<br>
}<br>
#endif /* RTLD_DI_SETSIGNAL */<br>
<br>
- if (OsSigWrapper != NULL) {<br>
- if (OsSigWrapper(signo) == 0) {<br>
- /* ddx handled signal and wants us to continue */<br>
- return;<br>
- }<br>
- }<br>
-<br>
/* log, cleanup, and abort */<br>
xorg_backtrace();<br>
<span class="gmail-HOEnZb"><font color="#888888"><br>
--<br>
2.14.3<br>
<br>
______________________________<wbr>_________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" rel="noreferrer" target="_blank">http://lists.x.org/archives/<wbr>xorg-devel</a><br>
Info: <a href="https://lists.x.org/mailman/listinfo/xorg-devel" rel="noreferrer" target="_blank">https://lists.x.org/mailman/<wbr>listinfo/xorg-devel</a></font></span></blockquote></div></div><div class="gmail_extra"><br></div><div class="gmail_extra"><div class="gmail_extra">Note that xf86-video-intel/src/sna/sna_a<wbr>ccel.c makes use of OsRegisterSigWrapper() and will need updating.<br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Anyway, LGTM.<br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Reviewed-by: Olivier Fourdan <<a href="mailto:ofourdan@redhat.com" target="_blank">ofourdan@redhat.com</a>></div></div></div>