From 5706bf3efa8d8262982bbed15fb041e536f56cf2 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 7 Oct 2023 14:26:23 +0200 Subject: lib: Wrap pthread_cond_timedwait for NULL abstime We often have the pattern where we NULL-check abstime for pthread_cond_timedwait to call pthread_cond_wait if it is. Added a __timedwait function to wrap this. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/irmd/reg/proc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/irmd/reg/proc.c') diff --git a/src/irmd/reg/proc.c b/src/irmd/reg/proc.c index 1aae789d..8a016afe 100644 --- a/src/irmd/reg/proc.c +++ b/src/irmd/reg/proc.c @@ -211,11 +211,7 @@ int reg_proc_sleep(struct reg_proc * proc, pthread_cleanup_push(cancel_reg_proc, proc); while (proc->state == PROC_SLEEP && ret != -ETIMEDOUT) - if (dl != NULL) - ret = -pthread_cond_timedwait(&proc->cond, - &proc->lock, dl); - else - ret = -pthread_cond_wait(&proc->cond, &proc->lock); + ret = -__timedwait(&proc->cond, &proc->lock, dl); pthread_cleanup_pop(false); -- cgit v1.2.3