*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
// $Id: Sig_Adapter.cpp 80826 2008-03-04 14:51:23Z wotte $
|
||||
|
||||
#include "ace/Sig_Adapter.h"
|
||||
|
||||
ACE_RCSID(ace, Sig_Adapter, "$Id: Sig_Adapter.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey)
|
||||
: sigkey_ (sigkey),
|
||||
type_ (SIG_ACTION),
|
||||
@@ -12,7 +9,6 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey)
|
||||
{
|
||||
// ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
|
||||
}
|
||||
|
||||
ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Event_Handler *eh,
|
||||
int sigkey)
|
||||
: sigkey_ (sigkey),
|
||||
@@ -21,7 +17,6 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Event_Handler *eh,
|
||||
{
|
||||
// ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
|
||||
}
|
||||
|
||||
ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func,
|
||||
int sigkey)
|
||||
: sigkey_ (sigkey),
|
||||
@@ -30,40 +25,32 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func,
|
||||
{
|
||||
// ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
|
||||
}
|
||||
|
||||
ACE_Sig_Adapter::~ACE_Sig_Adapter ()
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
ACE_Sig_Adapter::sigkey (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_Sig_Adapter::sigkey");
|
||||
return this->sigkey_;
|
||||
}
|
||||
|
||||
int
|
||||
ACE_Sig_Adapter::handle_signal (int signum,
|
||||
siginfo_t *siginfo,
|
||||
ucontext_t *ucontext)
|
||||
{
|
||||
ACE_TRACE ("ACE_Sig_Adapter::handle_signal");
|
||||
|
||||
switch (this->type_)
|
||||
{
|
||||
case SIG_ACTION:
|
||||
{
|
||||
// We have to dispatch a handler that was registered by a
|
||||
// third-party library.
|
||||
|
||||
ACE_Sig_Action old_disp;
|
||||
|
||||
// Make sure this handler executes in the context it was
|
||||
// expecting...
|
||||
this->sa_.register_action (signum, &old_disp);
|
||||
|
||||
ACE_Sig_Handler_Ex sig_func = ACE_Sig_Handler_Ex (this->sa_.handler ());
|
||||
|
||||
(*sig_func) (signum, siginfo, ucontext);
|
||||
// Restore the original disposition.
|
||||
old_disp.register_action (signum);
|
||||
|
||||
Reference in New Issue
Block a user