From 49e6e83b203f1be3fe9488f3330c085f691a8ad5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Thu, 13 Apr 2017 10:25:16 +0200 Subject: [PATCH] Simplification of sig-monitor MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove unused functions Change-Id: Ie767469a3e721aba5d9d27ab318a1d316553b2cb Signed-off-by: José Bollo --- src/sig-monitor.c | 14 ++------------ src/sig-monitor.h | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/sig-monitor.c b/src/sig-monitor.c index 89fd4444..3e16f720 100644 --- a/src/sig-monitor.c +++ b/src/sig-monitor.c @@ -163,16 +163,6 @@ void sig_monitor_clean_timeouts() } void sig_monitor(int timeout, void (*function)(int sig, void*), void *arg) -{ - sig_monitor3(timeout, (void (*)(int,void*,void*,void*))function, arg, NULL, NULL); -} - -void sig_monitor2(int timeout, void (*function)(int sig, void*, void*), void *arg1, void *arg2) -{ - sig_monitor3(timeout, (void (*)(int,void*,void*,void*))function, arg1, arg2, NULL); -} - -void sig_monitor3(int timeout, void (*function)(int sig, void*, void*, void*), void *arg1, void *arg2, void *arg3) { volatile int signum, signum2; sigjmp_buf jmpbuf, *older; @@ -183,11 +173,11 @@ void sig_monitor3(int timeout, void (*function)(int sig, void*, void*, void*), v error_handler = &jmpbuf; if (timeout) timeout_arm(timeout); - function(0, arg1, arg2, arg3); + function(0, arg); } else { signum2 = setjmp(jmpbuf); if (signum2 == 0) - function(signum, arg1, arg2, arg3); + function(signum, arg); } error_handler = older; if (timeout) diff --git a/src/sig-monitor.h b/src/sig-monitor.h index a3a28bc1..6a93b799 100644 --- a/src/sig-monitor.h +++ b/src/sig-monitor.h @@ -22,6 +22,4 @@ extern void sig_monitor_clean_timeouts(); extern int sig_monitor_init_timeouts(); extern void sig_monitor(int timeout, void (*function)(int sig, void*), void *arg); -extern void sig_monitor2(int timeout, void (*function)(int sig, void*, void*), void *arg1, void *arg2); -extern void sig_monitor3(int timeout, void (*function)(int sig, void*, void*, void*), void *arg1, void *arg2, void *arg3); -- 2.16.6