cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 21:10:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

mostly whitespace fixes from OpenBSD via Brad

Browse Source 
svn:r192
This commit is contained in:
Niels Provos 2005-12-17 20:25:22 +00:00
parent 686dede71b
commit 1d308e8813
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
event.c
View File

@ -24,7 +24,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
poll.c
View File

@ -93,7 +93,7 @@ poll_init(void)
if (getenv("EVENT_NOPOLL")) if (getenv("EVENT_NOPOLL"))
return (NULL); return (NULL);
if (!(pollop = calloc(1, sizeof(struct pollop)))) if (!(pollop = calloc(1, sizeof(struct pollop))))
return (NULL); return (NULL);
evsignal_init(&pollop->evsigmask); evsignal_init(&pollop->evsigmask);

12
signal.c
View File

@ -26,7 +26,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
@ -110,12 +112,12 @@ int
evsignal_add(sigset_t *evsigmask, struct event *ev) evsignal_add(sigset_t *evsigmask, struct event *ev)
{ {
int evsignal; int evsignal;
if (ev->ev_events & (EV_READ|EV_WRITE)) if (ev->ev_events & (EV_READ|EV_WRITE))
event_errx(1, "%s: EV_SIGNAL incompatible use", __func__); event_errx(1, "%s: EV_SIGNAL incompatible use", __func__);
evsignal = EVENT_SIGNAL(ev); evsignal = EVENT_SIGNAL(ev);
sigaddset(evsigmask, evsignal); sigaddset(evsigmask, evsignal);
return (0); return (0);
} }
@ -153,7 +155,7 @@ evsignal_recalc(sigset_t *evsigmask)
{ {
struct sigaction sa; struct sigaction sa;
struct event *ev; struct event *ev;
if (!ev_signal_added) { if (!ev_signal_added) {
ev_signal_added = 1; ev_signal_added = 1;
event_add(&ev_signal, NULL); event_add(&ev_signal, NULL);
@ -165,13 +167,13 @@ evsignal_recalc(sigset_t *evsigmask)
if (sigprocmask(SIG_BLOCK, evsigmask, NULL) == -1) if (sigprocmask(SIG_BLOCK, evsigmask, NULL) == -1)
return (-1); return (-1);
/* Reinstall our signal handler. */ /* Reinstall our signal handler. */
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = evsignal_handler; sa.sa_handler = evsignal_handler;
sa.sa_mask = *evsigmask; sa.sa_mask = *evsigmask;
sa.sa_flags |= SA_RESTART; sa.sa_flags |= SA_RESTART;
TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) { TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
if (sigaction(EVENT_SIGNAL(ev), &sa, NULL) == -1) if (sigaction(EVENT_SIGNAL(ev), &sa, NULL) == -1)
return (-1); return (-1);