r19602@catbus: nickm | 2008-05-05 11:45:18 -0400

Make most of the tests use the new headers.


svn:r776
This commit is contained in:
Nick Mathewson 2008-05-05 15:46:00 +00:00
parent bb37fbb22e
commit 4e8a339ef7
7 changed files with 28 additions and 13 deletions

View File

@ -55,8 +55,14 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include "event.h" #include "event2/event.h"
#include "evutil.h" #include "event2/event_struct.h"
#include "event2/event_compat.h"
#include "event2/tag.h"
#include "event2/buffer.h"
#include "event2/bufferevent.h"
#include "event2/bufferevent_struct.h"
#include "event2/util.h"
#include "event-internal.h" #include "event-internal.h"
#include "evbuffer-internal.h" #include "evbuffer-internal.h"
#include "log.h" #include "log.h"

View File

@ -59,7 +59,8 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "event.h" #include "event2/event.h"
#include "event2/event_compat.h"
#include "evdns.h" #include "evdns.h"
#include "log.h" #include "log.h"

View File

@ -36,8 +36,9 @@
#include <pthread.h> #include <pthread.h>
#include <assert.h> #include <assert.h>
#include "evutil.h" #include "event2/util.h"
#include "event.h" #include "event2/event.h"
#include "event2/event_struct.h"
#include "event2/thread.h" #include "event2/thread.h"
void regress_pthread(void); void regress_pthread(void);

View File

@ -53,7 +53,7 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include "event.h" #include "event2/event.h"
#include "evhttp.h" #include "evhttp.h"
#include "log.h" #include "log.h"
#include "evrpc.h" #include "evrpc.h"

View File

@ -49,8 +49,11 @@
#include <zlib.h> #include <zlib.h>
#include <assert.h> #include <assert.h>
#include "evutil.h" #include "event2/util.h"
#include "event.h" #include "event2/event.h"
#include "event2/event_compat.h"
#include "event2/buffer.h"
#include "event2/bufferevent.h"
void regress_zlib(void); void regress_zlib(void);
@ -175,7 +178,7 @@ zlib_output_filter(struct evbuffer *src, struct evbuffer *dst,
static void static void
readcb(struct bufferevent *bev, void *arg) readcb(struct bufferevent *bev, void *arg)
{ {
if (EVBUFFER_LENGTH(bev->input) == 8333) { if (EVBUFFER_LENGTH(bufferevent_input(bev)) == 8333) {
struct evbuffer *evbuf = evbuffer_new(); struct evbuffer *evbuf = evbuffer_new();
assert(evbuf != NULL); assert(evbuf != NULL);
@ -194,7 +197,7 @@ readcb(struct bufferevent *bev, void *arg)
static void static void
writecb(struct bufferevent *bev, void *arg) writecb(struct bufferevent *bev, void *arg)
{ {
if (EVBUFFER_LENGTH(bev->output) == 0) if (EVBUFFER_LENGTH(bufferevent_output(bev)) == 0)
test_ok++; test_ok++;
} }

View File

@ -17,7 +17,9 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <event.h> #include <event2/event.h>
#include <event2/event_compat.h>
#include <event2/event_struct.h>
int called = 0; int called = 0;

View File

@ -24,8 +24,10 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <event.h> #include <event2/event.h>
#include <evutil.h> #include <event2/event_struct.h>
#include <event2/event_compat.h>
#include <event2/util.h>
int pair[2]; int pair[2];
int test_okay = 1; int test_okay = 1;