summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libevent/Makefile4
-rw-r--r--lib/libevent/buffer.c6
-rw-r--r--lib/libevent/evbuffer.c6
-rw-r--r--lib/libevent/event.c8
-rw-r--r--lib/libevent/kqueue.c8
-rw-r--r--lib/libevent/poll.c4
-rw-r--r--lib/libevent/signal.c4
7 files changed, 20 insertions, 20 deletions
diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile
index 1f090465c9e..b16663454a0 100644
--- a/lib/libevent/Makefile
+++ b/lib/libevent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2005/06/22 01:05:27 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2005/07/02 07:15:13 grunk Exp $
LIB= event
SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
@@ -19,7 +19,7 @@ MLINKS= event.3 event_init.3 event.3 event_dispatch.3 event.3 event_loop.3 \
bufferevent_settimeout.3 event.3 evbuffer_new.3 event.3 evbuffer_free.3 \
event.3 evbuffer_add.3 event.3 evbuffer_add_buffer.3 event.3 \
evbuffer_add_printf.3 event.3 evbuffer_drain.3 event.3 evbuffer_write.3 \
- event.3 evbuffer_read.3 event.3 evbuffer_find.3
+ event.3 evbuffer_read.3 event.3 evbuffer_find.3
CFLAGS+= -I${.CURDIR} \
-DHAVE_FCNTL_H \
diff --git a/lib/libevent/buffer.c b/lib/libevent/buffer.c
index 379415a7f33..de04f0bf079 100644
--- a/lib/libevent/buffer.c
+++ b/lib/libevent/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.6 2005/06/18 01:52:22 brad Exp $ */
+/* $OpenBSD: buffer.c,v 1.7 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu>
@@ -77,7 +77,7 @@ evbuffer_free(struct evbuffer *buffer)
free(buffer);
}
-/*
+/*
* This is a destructive add. The data from one buffer moves into
* the other buffer.
*/
@@ -105,7 +105,7 @@ evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
SWAP(outbuf, inbuf);
SWAP(inbuf, &tmp);
- /*
+ /*
* Optimization comes with a price; we need to notify the
* buffer if necessary of the changes. oldoff is the amount
* of data that we tranfered from inbuf to outbuf
diff --git a/lib/libevent/evbuffer.c b/lib/libevent/evbuffer.c
index e886b405145..03029c9a0b3 100644
--- a/lib/libevent/evbuffer.c
+++ b/lib/libevent/evbuffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evbuffer.c,v 1.5 2005/05/04 03:17:48 brad Exp $ */
+/* $OpenBSD: evbuffer.c,v 1.6 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu>
@@ -66,7 +66,7 @@ bufferevent_add(struct event *ev, int timeout)
return (event_add(ev, ptv));
}
-/*
+/*
* This callback is executed when the size of the input buffer changes.
* We use it to apply back pressure on the reading side.
*/
@@ -75,7 +75,7 @@ void
bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now,
void *arg) {
struct bufferevent *bufev = arg;
- /*
+ /*
* If we are below the watermak then reschedule reading if it's
* still enabled.
*/
diff --git a/lib/libevent/event.c b/lib/libevent/event.c
index b5b9fcdcf16..fb5e1bac179 100644
--- a/lib/libevent/event.c
+++ b/lib/libevent/event.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: event.c,v 1.10 2005/05/04 03:17:48 brad Exp $ */
+/* $OpenBSD: event.c,v 1.11 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
@@ -40,7 +40,7 @@
#include <sys/tree.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
+#else
#include <sys/_time.h>
#endif
#include <sys/queue.h>
@@ -171,7 +171,7 @@ event_init(void)
if (current_base->evbase == NULL)
event_errx(1, "%s: no event mechanism available", __func__);
- if (!issetugid() && getenv("EVENT_SHOW_METHOD"))
+ if (!issetugid() && getenv("EVENT_SHOW_METHOD"))
event_msgx("libevent using: %s\n",
current_base->evsel->name);
@@ -802,7 +802,7 @@ event_get_version(void)
return (LIBEVENT_VERSION);
}
-/*
+/*
* No thread-safe interface needed - the information should be the same
* for all threads.
*/
diff --git a/lib/libevent/kqueue.c b/lib/libevent/kqueue.c
index 2bdcf78b215..39ed55ca966 100644
--- a/lib/libevent/kqueue.c
+++ b/lib/libevent/kqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kqueue.c,v 1.17 2005/06/18 01:52:22 brad Exp $ */
+/* $OpenBSD: kqueue.c,v 1.18 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
@@ -126,7 +126,7 @@ kq_init(void)
kqueueop->changes[0].ident = -1;
kqueueop->changes[0].filter = EVFILT_READ;
kqueueop->changes[0].flags = EV_ADD;
- /*
+ /*
* If kqueue works, then kevent will succeed, and it will
* stick an error in events[0]. If kqueue is broken, then
* kevent will fail.
@@ -190,7 +190,7 @@ kq_insert(struct kqop *kqop, struct kevent *kev)
memcpy(&kqop->changes[kqop->nchanges++], kev, sizeof(struct kevent));
event_debug(("%s: fd %d %s%s",
- __func__, kev->ident,
+ __func__, kev->ident,
kev->filter == EVFILT_READ ? "EVFILT_READ" : "EVFILT_WRITE",
kev->flags == EV_DELETE ? " (del)" : ""));
@@ -233,7 +233,7 @@ kq_dispatch(struct event_base *base, void *arg, struct timeval *tv)
int which = 0;
if (events[i].flags & EV_ERROR) {
- /*
+ /*
* Error messages that can happen, when a delete fails.
* EBADF happens when the file discriptor has been
* closed,
diff --git a/lib/libevent/poll.c b/lib/libevent/poll.c
index 8f691bbae0d..9da4d59cb50 100644
--- a/lib/libevent/poll.c
+++ b/lib/libevent/poll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: poll.c,v 1.9 2005/06/18 01:52:22 brad Exp $ */
+/* $OpenBSD: poll.c,v 1.10 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
@@ -342,7 +342,7 @@ poll_del(void *arg, struct event *ev)
--pop->nfds;
if (i != pop->nfds) {
- /*
+ /*
* Shift the last pollfd down into the now-unoccupied
* position.
*/
diff --git a/lib/libevent/signal.c b/lib/libevent/signal.c
index 8df05c5d32a..d2cc2b549df 100644
--- a/lib/libevent/signal.c
+++ b/lib/libevent/signal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.c,v 1.6 2005/04/22 00:56:25 brad Exp $ */
+/* $OpenBSD: signal.c,v 1.7 2005/07/02 07:15:13 grunk Exp $ */
/*
* Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
@@ -89,7 +89,7 @@ evsignal_init(sigset_t *evsigmask)
{
sigemptyset(evsigmask);
- /*
+ /*
* Our signal handler is going to write to one end of the socket
* pair to wake up our event loop. The event loop then scans for
* signals that got delivered.