diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-05-17 19:57:28 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-05-18 06:42:24 -0400 |
| commit | 41ba4dec60f7d9495c8d45c068d5c3d17e035e1e (patch) | |
| tree | 703b3c0c26e29e8def861100149028d43f8721e3 | |
| parent | 36019ab614068bdf3fc933addc3a9b4cb512c9e0 (diff) | |
| download | xorg-lib-libXt-41ba4dec60f7d9495c8d45c068d5c3d17e035e1e.tar.gz | |
use _X_NORETURN, works for gcc and clang
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
| -rw-r--r-- | include/X11/Intrinsic.h | 16 | ||||
| -rw-r--r-- | include/X11/IntrinsicI.h | 2 | ||||
| -rw-r--r-- | src/Error.c | 12 |
3 files changed, 16 insertions, 14 deletions
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index 99c4d84..7378101 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -1712,11 +1712,11 @@ void XtSessionReturnToken( extern XtErrorMsgHandler XtAppSetErrorMsgHandler( XtAppContext /* app_context */, - XtErrorMsgHandler /* handler */ + XtErrorMsgHandler /* handler */ _X_NORETURN ); extern void XtSetErrorMsgHandler( /* obsolete */ - XtErrorMsgHandler /* handler */ + XtErrorMsgHandler /* handler */ _X_NORETURN ); extern XtErrorMsgHandler XtAppSetWarningMsgHandler( @@ -1736,7 +1736,7 @@ extern void XtAppErrorMsg( _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -); +) _X_NORETURN; extern void XtErrorMsg( /* obsolete */ _Xconst _XtString /* name */, @@ -1745,7 +1745,7 @@ extern void XtErrorMsg( /* obsolete */ _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -); +) _X_NORETURN; extern void XtAppWarningMsg( XtAppContext /* app_context */, @@ -1768,11 +1768,11 @@ extern void XtWarningMsg( /* obsolete */ extern XtErrorHandler XtAppSetErrorHandler( XtAppContext /* app_context */, - XtErrorHandler /* handler */ + XtErrorHandler /* handler */ _X_NORETURN ); extern void XtSetErrorHandler( /* obsolete */ - XtErrorHandler /* handler */ + XtErrorHandler /* handler */ _X_NORETURN ); extern XtErrorHandler XtAppSetWarningHandler( @@ -1787,11 +1787,11 @@ extern void XtSetWarningHandler( /* obsolete */ extern void XtAppError( XtAppContext /* app_context */, _Xconst _XtString /* message */ -); +) _X_NORETURN; extern void XtError( /* obsolete */ _Xconst _XtString /* message */ -); +) _X_NORETURN; extern void XtAppWarning( XtAppContext /* app_context */, diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index c6d5773..a8b7f48 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -172,7 +172,7 @@ extern String XtCXtToolkitError; extern void _XtAllocError( String /* alloc_type */ -); +) _X_NORETURN; extern void _XtCompileResourceList( XtResourceList /* resources */, diff --git a/src/Error.c b/src/Error.c index 38d4e15..a302dbd 100644 --- a/src/Error.c +++ b/src/Error.c @@ -93,7 +93,7 @@ void _XtDefaultError(String) _X_NORETURN; void _XtDefaultWarning(String); static XtErrorMsgHandler errorMsgHandler = _XtDefaultErrorMsg; static XtErrorMsgHandler warningMsgHandler = _XtDefaultWarningMsg; -static XtErrorHandler errorHandler = _XtDefaultError; +static XtErrorHandler errorHandler _X_NORETURN = _XtDefaultError; static XtErrorHandler warningHandler = _XtDefaultWarning; #endif /* GLOBALERRORS */ @@ -344,6 +344,7 @@ void XtErrorMsg( (*errorMsgHandler)((String)name,(String)type,(String)class, (String)defaultp,params,num_params); UNLOCK_PROCESS; + exit(1); #else XtAppErrorMsg(_XtDefaultAppContext(),name,type,class, defaultp,params,num_params); @@ -364,6 +365,7 @@ void XtAppErrorMsg( (*errorMsgHandler)((String)name,(String)type,(String)class, (String)defaultp,params,num_params); UNLOCK_PROCESS; + exit(1); #else LOCK_APP(app); (*app->errorMsgHandler)(name,type,class,defaultp,params,num_params); @@ -412,7 +414,7 @@ void XtAppWarningMsg( } void XtSetErrorMsgHandler( - XtErrorMsgHandler handler) + XtErrorMsgHandler handler _X_NORETURN) { #if GLOBALERRORS LOCK_PROCESS; @@ -426,7 +428,7 @@ void XtSetErrorMsgHandler( XtErrorMsgHandler XtAppSetErrorMsgHandler( XtAppContext app, - XtErrorMsgHandler handler) + XtErrorMsgHandler handler _X_NORETURN) { XtErrorMsgHandler old; #if GLOBALERRORS @@ -547,7 +549,7 @@ void XtAppWarning( #endif /* GLOBALERRORS */ } -void XtSetErrorHandler(XtErrorHandler handler) +void XtSetErrorHandler(XtErrorHandler handler _X_NORETURN) { #if GLOBALERRORS LOCK_PROCESS; @@ -561,7 +563,7 @@ void XtSetErrorHandler(XtErrorHandler handler) XtErrorHandler XtAppSetErrorHandler( XtAppContext app, - XtErrorHandler handler) + XtErrorHandler handler _X_NORETURN) { XtErrorHandler old; #if GLOBALERRORS |