xfree86: remove xf86CaughtSignal etc.
This no longer does anything useful. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
9c72887939
commit
4353d83f60
|
@ -296,8 +296,6 @@ xf86ServerIsResetting(void);
|
|||
extern _X_EXPORT Bool
|
||||
xf86ServerIsOnlyDetecting(void);
|
||||
extern _X_EXPORT Bool
|
||||
xf86CaughtSignal(void);
|
||||
extern _X_EXPORT Bool
|
||||
xf86GetVidModeAllowNonLocal(void);
|
||||
extern _X_EXPORT Bool
|
||||
xf86GetVidModeEnabled(void);
|
||||
|
|
|
@ -267,17 +267,6 @@ xf86RemoveEnabledDevice(InputInfoPtr pInfo)
|
|||
InputThreadUnregisterDev(pInfo->fd);
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86SigWrapper --
|
||||
* Catch unexpected signals and exit or continue cleanly.
|
||||
*/
|
||||
int
|
||||
xf86SigWrapper(int signo)
|
||||
{
|
||||
xf86Info.caughtSignal = TRUE;
|
||||
return 1; /* abort */
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86PrintBacktrace --
|
||||
* Print a stack backtrace for debugging purposes.
|
||||
|
|
|
@ -107,7 +107,6 @@ xf86InfoRec xf86Info = {
|
|||
.dontZap = FALSE,
|
||||
.dontZoom = FALSE,
|
||||
.notrapSignals = FALSE,
|
||||
.caughtSignal = FALSE,
|
||||
.currentScreen = NULL,
|
||||
#ifdef CSRG_BASED
|
||||
.consType = -1,
|
||||
|
|
|
@ -1428,12 +1428,6 @@ xf86ServerIsOnlyDetecting(void)
|
|||
return xf86DoConfigure;
|
||||
}
|
||||
|
||||
Bool
|
||||
xf86CaughtSignal(void)
|
||||
{
|
||||
return xf86Info.caughtSignal;
|
||||
}
|
||||
|
||||
Bool
|
||||
xf86GetVidModeAllowNonLocal(void)
|
||||
{
|
||||
|
|
|
@ -298,16 +298,9 @@ xf86PrivsElevated(void)
|
|||
}
|
||||
|
||||
static void
|
||||
InstallSignalHandlers(void)
|
||||
TrapSignals(void)
|
||||
{
|
||||
/*
|
||||
* Install signal handler for unexpected signals
|
||||
*/
|
||||
xf86Info.caughtSignal = FALSE;
|
||||
if (!xf86Info.notrapSignals) {
|
||||
OsRegisterSigWrapper(xf86SigWrapper);
|
||||
}
|
||||
else {
|
||||
if (xf86Info.notrapSignals) {
|
||||
OsSignal(SIGSEGV, SIG_DFL);
|
||||
OsSignal(SIGABRT, SIG_DFL);
|
||||
OsSignal(SIGILL, SIG_DFL);
|
||||
|
@ -423,7 +416,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
InstallSignalHandlers();
|
||||
TrapSignals();
|
||||
|
||||
/* Initialise the loader */
|
||||
LoaderInit();
|
||||
|
@ -960,10 +953,6 @@ ddxGiveUp(enum ExitCode error)
|
|||
dbus_core_fini();
|
||||
|
||||
xf86CloseLog(error);
|
||||
|
||||
/* If an unexpected signal was caught, dump a core for debugging */
|
||||
if (xf86Info.caughtSignal)
|
||||
OsAbort();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -135,8 +135,6 @@ DoShowOptions(void)
|
|||
|
||||
extern _X_EXPORT void
|
||||
xf86Wakeup(void *blockData, int err);
|
||||
extern _X_HIDDEN int
|
||||
xf86SigWrapper(int signo);
|
||||
extern _X_EXPORT void
|
||||
xf86HandlePMEvents(int fd, void *data);
|
||||
extern _X_EXPORT int (*xf86PMGetEventFromOs) (int fd, pmEvent * events,
|
||||
|
|
|
@ -64,7 +64,6 @@ typedef struct {
|
|||
Bool dontZap;
|
||||
Bool dontZoom;
|
||||
Bool notrapSignals; /* don't exit cleanly - die at fault */
|
||||
Bool caughtSignal;
|
||||
|
||||
/* graphics part */
|
||||
ScreenPtr currentScreen;
|
||||
|
|
|
@ -2053,16 +2053,6 @@ functions is as follows:
|
|||
|
||||
</para></blockquote>
|
||||
|
||||
<blockquote><para>
|
||||
<programlisting>
|
||||
Bool xf86CaughtSignal();
|
||||
</programlisting>
|
||||
<blockquote><para>
|
||||
Returns <constant>TRUE</constant> if the server has caught a signal,
|
||||
and <constant>FALSE</constant> otherwise.
|
||||
</para></blockquote>
|
||||
|
||||
</para></blockquote>
|
||||
</sect2>
|
||||
|
||||
<sect2>
|
||||
|
|
Loading…
Reference in New Issue