diff options
| -rw-r--r-- | lib/libevent/buffer.c | 7 | ||||
| -rw-r--r-- | lib/libevent/evutil.c | 11 | ||||
| -rw-r--r-- | lib/libevent/kqueue.c | 19 | ||||
| -rw-r--r-- | lib/libevent/select.c | 6 |
4 files changed, 7 insertions, 36 deletions
diff --git a/lib/libevent/buffer.c b/lib/libevent/buffer.c index eb27e5fa249..0af5bc99b65 100644 --- a/lib/libevent/buffer.c +++ b/lib/libevent/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.23 2014/10/18 16:48:28 bluhm Exp $ */ +/* $OpenBSD: buffer.c,v 1.24 2014/10/18 21:56:44 bluhm Exp $ */ /* * Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu> @@ -128,9 +128,6 @@ evbuffer_add_vprintf(struct evbuffer *buf, const char *fmt, va_list ap) assert(buf->totallen >= used); space = buf->totallen - used; -#ifndef va_copy -#define va_copy(dst, src) memcpy(&(dst), &(src), sizeof(va_list)) -#endif va_copy(aq, ap); sz = evutil_vsnprintf(buffer, space, fmt, aq); @@ -417,7 +414,6 @@ evbuffer_read(struct evbuffer *buf, int fd, int howmuch) size_t oldoff = buf->off; int n = EVBUFFER_MAX_READ; -#if defined(FIONREAD) if (ioctl(fd, FIONREAD, &n) == -1 || n <= 0) { n = EVBUFFER_MAX_READ; } else if (n > EVBUFFER_MAX_READ && n > howmuch) { @@ -433,7 +429,6 @@ evbuffer_read(struct evbuffer *buf, int fd, int howmuch) if (n < EVBUFFER_MAX_READ) n = EVBUFFER_MAX_READ; } -#endif if (howmuch < 0 || howmuch > n) howmuch = n; diff --git a/lib/libevent/evutil.c b/lib/libevent/evutil.c index 4fd3a06baa1..5180230f075 100644 --- a/lib/libevent/evutil.c +++ b/lib/libevent/evutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evutil.c,v 1.8 2014/10/18 16:48:28 bluhm Exp $ */ +/* $OpenBSD: evutil.c,v 1.9 2014/10/18 21:56:44 bluhm Exp $ */ /* * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> @@ -85,18 +85,9 @@ evutil_snprintf(char *buf, size_t buflen, const char *format, ...) int evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap) { -#ifdef _MSC_VER - int r = _vsnprintf(buf, buflen, format, ap); - buf[buflen-1] = '\0'; - if (r >= 0) - return r; - else - return _vscprintf(format, ap); -#else int r = vsnprintf(buf, buflen, format, ap); buf[buflen-1] = '\0'; return r; -#endif } static int diff --git a/lib/libevent/kqueue.c b/lib/libevent/kqueue.c index 7960c0c9146..5b4d73c448b 100644 --- a/lib/libevent/kqueue.c +++ b/lib/libevent/kqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kqueue.c,v 1.32 2014/10/18 16:48:28 bluhm Exp $ */ +/* $OpenBSD: kqueue.c,v 1.33 2014/10/18 21:56:44 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -41,15 +41,6 @@ #include <assert.h> #include <inttypes.h> -/* Some platforms apparently define the udata field of struct kevent as - * intptr_t, whereas others define it as void*. There doesn't seem to be an - * easy way to tell them apart via autoconf, so we need to use OS macros. */ -#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__darwin__) && !defined(__APPLE__) -#define PTR_TO_UDATA(x) ((intptr_t)(x)) -#else -#define PTR_TO_UDATA(x) (x) -#endif - #include "event.h" #include "event-internal.h" #include "log.h" @@ -326,7 +317,7 @@ kq_add(void *arg, struct event *ev) kev.ident = nsignal; kev.filter = EVFILT_SIGNAL; kev.flags = EV_ADD; - kev.udata = PTR_TO_UDATA(&kqop->evsigevents[nsignal]); + kev.udata = &kqop->evsigevents[nsignal]; /* Be ready for the signal if it is sent any * time between now and the next call to @@ -349,14 +340,12 @@ kq_add(void *arg, struct event *ev) memset(&kev, 0, sizeof(kev)); kev.ident = ev->ev_fd; kev.filter = EVFILT_READ; -#ifdef NOTE_EOF /* Make it behave like select() and poll() */ kev.fflags = NOTE_EOF; -#endif kev.flags = EV_ADD; if (!(ev->ev_events & EV_PERSIST)) kev.flags |= EV_ONESHOT; - kev.udata = PTR_TO_UDATA(ev); + kev.udata = ev; if (kq_insert(kqop, &kev) == -1) return (-1); @@ -371,7 +360,7 @@ kq_add(void *arg, struct event *ev) kev.flags = EV_ADD; if (!(ev->ev_events & EV_PERSIST)) kev.flags |= EV_ONESHOT; - kev.udata = PTR_TO_UDATA(ev); + kev.udata = ev; if (kq_insert(kqop, &kev) == -1) return (-1); diff --git a/lib/libevent/select.c b/lib/libevent/select.c index 43033c2f981..ed9ab7e65e2 100644 --- a/lib/libevent/select.c +++ b/lib/libevent/select.c @@ -1,4 +1,4 @@ -/* $OpenBSD: select.c,v 1.21 2014/10/18 16:48:28 bluhm Exp $ */ +/* $OpenBSD: select.c,v 1.22 2014/10/18 21:56:44 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -48,10 +48,6 @@ #include "evsignal.h" #include "log.h" -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif - struct selectop { int event_fds; /* Highest fd in fd set */ int event_fdsz; |