minor corrections; change license to 3-clause BSD license

svn:r84

diff --git a/epoll.c b/epoll.c
index 149efc2a89577abfbd63ed0a27aac11dc4458f30..edca74ce8e86cc742e989f8c79a4dd6407691d98 100644 (file)
--- a/epoll.c
+++ b/epoll.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/epoll_sub.c b/epoll_sub.c
index e73c159c78f3eed0e24508175b82871951b6485b..431970c73a6dbe5ff900ac9962f3d3dcc8ddf16f 100644 (file)
--- a/epoll_sub.c
+++ b/epoll_sub.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/event.c b/event.c
index b3d4a9f142ecb9ee8b94bc8fd3f78986265c77bd..1dda1a7d0dc269d20c94bfe290bff07f7cdfad2e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/event.h b/event.h
index 5daa23f695e8c75905ba64d6c47d2fb74966a8b8..bfac3f2a23b0d0dbee6035dd4826a148d76d887b 100644 (file)
--- a/event.h
+++ b/event.h
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/evsignal.h b/evsignal.h
index 630c18f038a2c51f9c5e62f84455d46b313e7a0f..8de27a5cec28b0a0397c9041a1d4c1075fce6879 100644 (file)
--- a/evsignal.h
+++ b/evsignal.h
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/kqueue.c b/kqueue.c
index 103715ff498531fcd00027fa8b421feba0aeed0d..949db4d2b13629715afff078bc4301e8bf57d620 100644 (file)
--- a/kqueue.c
+++ b/kqueue.c
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -59,7 +56,7 @@
 #define log_error      warn
 #endif
 
-#ifdef HAVE_INTTYPES_H
+#if defined(HAVE_INTTYPES_H) && !defined(__OpenBSD__)
 #define INTPTR(x)      (intptr_t)x
 #else
 #define INTPTR(x)      x

diff --git a/poll.c b/poll.c
index d41755ddcb360de16cb941158f2c8ce1463dc08c..b6613ba91ffd17c5403be1534ee455f18c133723 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/rtsig.c b/rtsig.c
index 81567f4b4472b6cf3c547341536e144b095dbe9f..960715f39a566156d4307f328ba4e8e2b161c21d 100644 (file)
--- a/rtsig.c
+++ b/rtsig.c
@@ -285,8 +285,9 @@ rtsig_dispatch(void *arg, struct timeval *tv)
                signum = sigtimedwait(&op->sigs, &info, &ts);
 
                if (signum == -1) {
-                       if (errno == EAGAIN) break;
-                       return errno == EINTR ? 0 : -1;
+                       if (errno == EAGAIN)
+                               break;
+                       return (errno == EINTR ? 0 : -1);
                }
 
                ts.tv_sec = ts.tv_nsec = 0;
@@ -381,8 +382,10 @@ rtsig_dispatch(void *arg, struct timeval *tv)
                        int flags = 0;
                        struct event *ev = op->toev[i];
 
-                       if (op->poll[i].revents & POLLIN) flags |= EV_READ;
-                       if (op->poll[i].revents & POLLOUT) flags |= EV_WRITE;
+                       if (op->poll[i].revents & POLLIN)
+                               flags |= EV_READ;
+                       if (op->poll[i].revents & POLLOUT)
+                               flags |= EV_WRITE;
 
                        if (!(ev->ev_events & EV_PERSIST)) {
                                event_del(ev);
@@ -422,6 +425,9 @@ rtsig_dispatch(void *arg, struct timeval *tv)
                /* We just freed it, we shouldn't have a problem getting it back. */
                op->poll = malloc(sizeof(*op->poll) * op->max);
                op->toev = malloc(sizeof(*op->toev) * op->max);
+
+               if (op->poll == NULL || op->toev == NULL)
+                       err(1, "%s: malloc");
        }
 
        return (0);

diff --git a/select.c b/select.c
index 77fdb0505d56d37717da09b4911a874f4789b8bc..0a47a6a86345dc17a88ddd6e27ed64b17cf005ee 100644 (file)
--- a/select.c
+++ b/select.c
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

diff --git a/signal.c b/signal.c
index c5a3a12eb1107544b82cba8e8da659dd8188ed68..c748927a74eb7d5602de9458edcd462b8293115e 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR