From 09b0109620d0a6f1122844868ad30d3e66d11e94 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 5 Dec 2005 20:20:18 +0000 Subject: Remove unneeded whitespace. * cygtls.cc (_cygtls::set_state): Delete. (_cygtls::reset_exception): Ditto. (_cygtls::init_thread): Set initialized state directly here. (_cygtls::push): Remove exception argument. Don't treat exceptions specially. * cygtls.h (_cygtls::push): Ditto. (_cygtls::isinitialized): Don't treat exceptions specially. (_cygtls::reset_exception): Delete. (_cygtls::set_state): Ditto. (_cygtls::handle_exceptions): Don't push ebp on the stack prior to calling sig_send. Just set incyg instead. (_cygtls::interrupt_setup): Accommodate _cygtls::push argument change. (_cygtls::interrupt_now): Ditto. (setup_handler): Don't treat exceptions specially. * gendef (longjmp): Always zero incyg flag. --- winsup/cygwin/cygtls.cc | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'winsup/cygwin/cygtls.cc') diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index fa755168c..568c5af23 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -59,24 +59,6 @@ _cygtls::init () sentry::lock.init ("sentry_lock"); } -void -_cygtls::set_state (bool is_exception) -{ - initialized = CYGTLS_INITIALIZED + is_exception; -} - -void -_cygtls::reset_exception () -{ - if (initialized == CYGTLS_EXCEPTION) - { -#ifdef DEBUGGING - debug_printf ("resetting stack after an exception stack %p, stackptr %p", stack, stackptr); -#endif - set_state (false); - } -} - /* Two calls to get the stack right... */ void _cygtls::call (DWORD (*func) (void *, void *), void *arg) @@ -118,8 +100,8 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *)) init_exception_handler (handle_exceptions); } + initialized = CYGTLS_INITIALIZED; locals.exitsock = INVALID_SOCKET; - set_state (false); errno_addr = &(local_clib._errno); if ((void *) func == (void *) cygthread::stub @@ -202,14 +184,9 @@ _cygtls::remove (DWORD wait) } void -_cygtls::push (__stack_t addr, bool exception) +_cygtls::push (__stack_t addr) { - if (exception) - lock (); *stackptr++ = (__stack_t) addr; - if (exception) - unlock (); - set_state (exception); } #define BAD_IX ((size_t) -1) -- cgit v1.2.3