From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- libX11/src/ErrHndlr.c | 172 +++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'libX11/src/ErrHndlr.c') diff --git a/libX11/src/ErrHndlr.c b/libX11/src/ErrHndlr.c index c17d4eb26..167a68b1e 100644 --- a/libX11/src/ErrHndlr.c +++ b/libX11/src/ErrHndlr.c @@ -1,86 +1,86 @@ -/* - -Copyright 1986, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include "Xlibint.h" - -/* - * XErrorHandler - This procedure sets the X non-fatal error handler - * (_XErrorFunction) to be the specified routine. If NULL is passed in - * the original error handler is restored. - */ - -XErrorHandler -XSetErrorHandler(XErrorHandler handler) -{ - int (*oldhandler)(Display *dpy, XErrorEvent *event); - - _XLockMutex(_Xglobal_lock); - oldhandler = _XErrorFunction; - - if (!oldhandler) - oldhandler = _XDefaultError; - - if (handler != NULL) { - _XErrorFunction = handler; - } - else { - _XErrorFunction = _XDefaultError; - } - _XUnlockMutex(_Xglobal_lock); - - return (XErrorHandler) oldhandler; -} - -/* - * XIOErrorHandler - This procedure sets the X fatal I/O error handler - * (_XIOErrorFunction) to be the specified routine. If NULL is passed in - * the original error handler is restored. - */ - -XIOErrorHandler -XSetIOErrorHandler(XIOErrorHandler handler) -{ - int (*oldhandler)(Display *dpy); - - _XLockMutex(_Xglobal_lock); - oldhandler = _XIOErrorFunction; - - if (!oldhandler) - oldhandler = _XDefaultIOError; - - if (handler != NULL) { - _XIOErrorFunction = handler; - } - else { - _XIOErrorFunction = _XDefaultIOError; - } - _XUnlockMutex(_Xglobal_lock); - - return (XIOErrorHandler) oldhandler; -} +/* + +Copyright 1986, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifdef HAVE_CONFIG_H +#include +#endif +#include "Xlibint.h" + +/* + * XErrorHandler - This procedure sets the X non-fatal error handler + * (_XErrorFunction) to be the specified routine. If NULL is passed in + * the original error handler is restored. + */ + +XErrorHandler +XSetErrorHandler(XErrorHandler handler) +{ + int (*oldhandler)(Display *dpy, XErrorEvent *event); + + _XLockMutex(_Xglobal_lock); + oldhandler = _XErrorFunction; + + if (!oldhandler) + oldhandler = _XDefaultError; + + if (handler != NULL) { + _XErrorFunction = handler; + } + else { + _XErrorFunction = _XDefaultError; + } + _XUnlockMutex(_Xglobal_lock); + + return (XErrorHandler) oldhandler; +} + +/* + * XIOErrorHandler - This procedure sets the X fatal I/O error handler + * (_XIOErrorFunction) to be the specified routine. If NULL is passed in + * the original error handler is restored. + */ + +XIOErrorHandler +XSetIOErrorHandler(XIOErrorHandler handler) +{ + int (*oldhandler)(Display *dpy); + + _XLockMutex(_Xglobal_lock); + oldhandler = _XIOErrorFunction; + + if (!oldhandler) + oldhandler = _XDefaultIOError; + + if (handler != NULL) { + _XIOErrorFunction = handler; + } + else { + _XIOErrorFunction = _XDefaultIOError; + } + _XUnlockMutex(_Xglobal_lock); + + return (XIOErrorHandler) oldhandler; +} -- cgit v1.2.3