diff options
Diffstat (limited to 'ace/Signal.cpp')
| -rw-r--r-- | ace/Signal.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ace/Signal.cpp b/ace/Signal.cpp index a596ba17a33..16fd4fef9f5 100644 --- a/ace/Signal.cpp +++ b/ace/Signal.cpp @@ -465,9 +465,8 @@ ACE_Sig_Handlers_Set::instance (int signum) if (signum <= 0 || signum >= ACE_NSIG) return 0; // This will cause problems... else if (ACE_Sig_Handlers_Set::sig_handlers_[signum] == 0) - ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum], - ACE_SIG_HANDLERS_SET, - 0); + ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum], ACE_SIG_HANDLERS_SET, 0); + return ACE_Sig_Handlers_Set::sig_handlers_[signum]; } @@ -528,10 +527,8 @@ ACE_Sig_Handlers::register_handler (int signum, // Create a new 3rd party disposition, remembering its // preferred signal blocking etc...; - ACE_NEW_RETURN (extern_sh, - ACE_Sig_Adapter (sa, - ++ACE_Sig_Handlers::sigkey_), - -1); + ACE_NEW_RETURN (extern_sh, ACE_Sig_Adapter (sa, ++ACE_Sig_Handlers::sigkey_), -1); + // Add the external signal handler to the set of handlers // for this signal. if (ACE_Sig_Handlers_Set::instance (signum)->insert (extern_sh) == -1) @@ -541,10 +538,8 @@ ACE_Sig_Handlers::register_handler (int signum, } } // Add our new handler at this point. - ACE_NEW_RETURN (ace_sig_adapter, - ACE_Sig_Adapter (new_sh, - ++ACE_Sig_Handlers::sigkey_), - -1); + ACE_NEW_RETURN (ace_sig_adapter, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), -1); + // Add the ACE signal handler to the set of handlers for this // signal (make sure it goes before the external one if there is // one of these). @@ -755,10 +750,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) // ACE_Unbounded_Set...). ACE_Sig_Adapter *temp; - ACE_NEW_RETURN (temp, - ACE_Sig_Adapter (new_sh, - ++ACE_Sig_Handlers::sigkey_), - 0); + ACE_NEW_RETURN (temp, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), 0); handler_set->insert (temp); return *eh; } |