fixes from alexander von gernler

svn:r148

diff --git a/buffer.c b/buffer.c
index f334f219992ecf6d26a2e9849fa7f7d7f5bdad88..fb4576af143a488ce6c277188c810b172636ed10 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -166,7 +166,7 @@ end:
 int
 evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen)
 {
-       int nread = datlen;
+       size_t nread = datlen;
        if (nread >= buf->off)
                nread = buf->off;
 

diff --git a/evbuffer.c b/evbuffer.c
index 1d7c263bbbc1a90d57a4f5466b2063400a3865bf..4354f0f9ad3dc8f92ef616ba3fe2e6704ce8bd96 100644 (file)
--- a/evbuffer.c
+++ b/evbuffer.c
@@ -45,6 +45,11 @@
 
 #include "event.h"
 
+/* prototypes */
+
+void bufferevent_setwatermark(struct bufferevent *, short, size_t, size_t);
+void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *);
+
 static int
 bufferevent_add(struct event *ev, int timeout)
 {

diff --git a/kqueue.c b/kqueue.c
index 06af294b38d8caa2c4810236de91bf0f0aa96f30..3558b9c4707633a581de79a0968392b1f4c129dc 100644 (file)
--- a/kqueue.c
+++ b/kqueue.c
@@ -116,8 +116,8 @@ kq_init(void)
        }
        kqueueop->events = malloc(NEVENT * sizeof(struct kevent));
        if (kqueueop->events == NULL) {
-               free (kqueueop);
                free (kqueueop->changes);
+               free (kqueueop);
                return (NULL);
        }
        kqueueop->nevents = NEVENT;