diff options
| author |   claudio <claudio@openbsd.org> | 2007-05-02 09:07:28 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2007-05-02 09:07:28 +0000 |
| commit | d84110c895484cda5ef7bef3c463773797eadf48 (patch) | |
| tree | 0da836a37377cfa2956affda5236a581c4011935 | |
| parent | Make meta_read use the metadata memory that is provided in the discipline. (diff) | |
| download | wireguard-openbsd-d84110c895484cda5ef7bef3c463773797eadf48.tar.xz wireguard-openbsd-d84110c895484cda5ef7bef3c463773797eadf48.zip | |
It is no longer needed to pass a cleared timeval to event_loopexit() NULL
does the job just fine. OK reyk@
| -rw-r--r-- | usr.sbin/hoststated/relay.c | 11 | ||||
| -rw-r--r-- | usr.sbin/relayd/relay.c | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/usr.sbin/hoststated/relay.c b/usr.sbin/hoststated/relay.c index 686883e85ed..dd56a6972eb 100644 --- a/usr.sbin/hoststated/relay.c +++ b/usr.sbin/hoststated/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.26 2007/04/12 14:45:45 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.27 2007/05/02 09:07:28 claudio Exp $ */ /* * Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -131,17 +131,10 @@ int proc_id; void relay_sig_handler(int sig, short event, void *arg) { - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = 0; - switch (sig) { - case SIGALRM: case SIGTERM: - case SIGQUIT: case SIGINT: - event_loopexit(&tv); + (void)event_loopexit(NULL); } } diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index 686883e85ed..dd56a6972eb 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.26 2007/04/12 14:45:45 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.27 2007/05/02 09:07:28 claudio Exp $ */ /* * Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -131,17 +131,10 @@ int proc_id; void relay_sig_handler(int sig, short event, void *arg) { - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = 0; - switch (sig) { - case SIGALRM: case SIGTERM: - case SIGQUIT: case SIGINT: - event_loopexit(&tv); + (void)event_loopexit(NULL); } } |