From 46cd5b1767c3ca638a3f9170bfc4463bc83b62b4 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Mar 2015 10:47:59 +0100 Subject: flock: fix timeout handler pointer usage Signed-off-by: Karel Zak --- lib/monotonic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/monotonic.c') diff --git a/lib/monotonic.c b/lib/monotonic.c index a124debba..c6e0f7572 100644 --- a/lib/monotonic.c +++ b/lib/monotonic.c @@ -69,7 +69,7 @@ int gettime_monotonic(struct timeval *tv) } int setup_timer(timer_t * t_id, struct itimerval *timeout, - void (*timeout_handler)(void)) + void (*timeout_handler)(int, siginfo_t *, void *)) { struct sigaction sig_a; static struct sigevent sig_e = { @@ -85,8 +85,10 @@ int setup_timer(timer_t * t_id, struct itimerval *timeout, if (sigemptyset(&sig_a.sa_mask)) return 1; + sig_a.sa_flags = SA_SIGINFO; - sig_a.sa_handler = timeout_handler; + sig_a.sa_sigaction = timeout_handler; + if (sigaction(SIGALRM, &sig_a, 0)) return 1; if (timer_create(CLOCK_MONOTONIC, &sig_e, t_id)) -- cgit v1.2.3-55-g7522