aboutsummaryrefslogtreecommitdiffhomepage
path: root/signal.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-08 19:02:25 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-08 19:02:25 -0800
commitb6bc4381fb84caabb3631b654c8bb1f578657b7b (patch)
treeef5bcc660000a9dbdbdcb75ab627a0b056b499aa /signal.cpp
parentb3d0561c09c090a00544a24f1fcafb975a9d6915 (diff)
Get event_t off of halloc (!)
Diffstat (limited to 'signal.cpp')
-rw-r--r--signal.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/signal.cpp b/signal.cpp
index bd7b4a2f..8679eba3 100644
--- a/signal.cpp
+++ b/signal.cpp
@@ -427,15 +427,9 @@ const wchar_t *signal_get_desc( int sig )
*/
static void default_handler(int signal, siginfo_t *info, void *context)
{
- event_t e;
-
- e.type=EVENT_SIGNAL;
- e.param1.signal = signal;
- e.function_name=0;
-
+ event_t e = event_t::signal_event(signal);
if( event_get( &e, 0 ) )
{
-
event_fire( &e );
}
}
@@ -455,12 +449,7 @@ static void handle_winch( int sig, siginfo_t *info, void *context )
*/
static void handle_hup( int sig, siginfo_t *info, void *context )
{
- event_t e;
-
- e.type=EVENT_SIGNAL;
- e.param1.signal = SIGHUP;
- e.function_name=0;
-
+ event_t e = event_t::signal_event(SIGHUP);
if( event_get( &e, 0 ) )
{
default_handler( sig, 0, 0 );