ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flock: fix timeout handler pointer usage 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-03-05 10:47:59 +01:00
parent bde76c048a
commit 46cd5b1767
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/monotonic.h
View File

@ -9,7 +9,7 @@ extern int get_boot_time(struct timeval *boot_time);
extern int gettime_monotonic(struct timeval *tv);
extern int setup_timer(timer_t * t_id, struct itimerval *timeout,
void (*timeout_handler)(void));
void (*timeout_handler)(int, siginfo_t *, void *));
extern void cancel_timer(timer_t * t_id);
#endif /* UTIL_LINUX_BOOTTIME_H */

6
lib/monotonic.c
View File

@ -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))