cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-13 14:26:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

r18482@catbus: nickm | 2008-02-28 12:38:40 -0500

Browse Source 
Fix GCC 4.2 warnings; fix includes in subdirs.


svn:r675
This commit is contained in:
Nick Mathewson 2008-02-28 17:38:52 +00:00
parent 5c70ea4c9d
commit 0e7cbe6508
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buffer.c
View File

@ -226,9 +226,10 @@ evbuffer_drain(struct evbuffer *buf, size_t len)
/* Reads data from an event buffer and drains the bytes read */ /* Reads data from an event buffer and drains the bytes read */
int int
evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen) evbuffer_remove(struct evbuffer *buf, void *data_out, size_t datlen)
{ {
struct evbuffer_chain *chain = buf->first, *tmp; struct evbuffer_chain *chain = buf->first, *tmp;
char *data = data_out;
size_t nread; size_t nread;
if (datlen >= buf->total_len) if (datlen >= buf->total_len)
@ -332,7 +333,7 @@ u_char *
evbuffer_pullup(struct evbuffer *buf, int size) evbuffer_pullup(struct evbuffer *buf, int size)
{ {
struct evbuffer_chain *chain = buf->first, *next, *tmp; struct evbuffer_chain *chain = buf->first, *next, *tmp;
void *buffer; u_char *buffer;
if (size == -1) if (size == -1)
size = buf->total_len; size = buf->total_len;
@ -555,9 +556,10 @@ evbuffer_readln(struct evbuffer *buffer, size_t *n_read_out,
/* Adds data to an event buffer */ /* Adds data to an event buffer */
int int
evbuffer_add(struct evbuffer *buf, const void *data, size_t datlen) evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
{ {
struct evbuffer_chain *chain = buf->last; struct evbuffer_chain *chain = buf->last;
const u_char *data = data_in;
size_t old_len = buf->total_len, remain, to_alloc; size_t old_len = buf->total_len, remain, to_alloc;
if (chain == NULL) { if (chain == NULL) {
@ -656,7 +658,7 @@ evbuffer_chain_align(struct evbuffer_chain *chain)
int int
evbuffer_expand(struct evbuffer *buf, size_t datlen) evbuffer_expand(struct evbuffer *buf, size_t datlen)
{ {
struct evbuffer_chain *chain = buf->last; struct evbuffer_chain *chain = buf->last, *tmp;
size_t need, length; size_t need, length;
if (chain == NULL) { if (chain == NULL) {
@ -687,7 +689,7 @@ evbuffer_expand(struct evbuffer *buf, size_t datlen)
length = chain->buffer_len << 1; length = chain->buffer_len << 1;
if (length < datlen) if (length < datlen)
length = datlen; length = datlen;
struct evbuffer_chain *tmp = evbuffer_chain_new(length); tmp = evbuffer_chain_new(length);
if (tmp == NULL) if (tmp == NULL)
return (-1); return (-1);
chain->next = tmp; chain->next = tmp;

2
sample/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
LDADD = ../libevent.la LDADD = ../libevent.la
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include
noinst_PROGRAMS = event-test time-test signal-test noinst_PROGRAMS = event-test time-test signal-test

2
test/Makefile.am
View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include
EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c

8
test/regress.c
View File

@ -896,6 +896,7 @@ test_evbuffer(void)
static char buffer[512], *tmp; static char buffer[512], *tmp;
struct evbuffer *evb = evbuffer_new(); struct evbuffer *evb = evbuffer_new();
struct evbuffer *evb_two = evbuffer_new(); struct evbuffer *evb_two = evbuffer_new();
size_t sz_tmp;
int i; int i;
setup_test("Testing Evbuffer: "); setup_test("Testing Evbuffer: ");
@ -951,9 +952,10 @@ test_evbuffer(void)
goto out; goto out;
/* test remove buffer */ /* test remove buffer */
evbuffer_remove_buffer(evb, evb_two, sizeof(buffer) * 2.5); sz_tmp = sizeof(buffer)*2.5;
if (EVBUFFER_LENGTH(evb_two) != sizeof(buffer) * 2.5 || evbuffer_remove_buffer(evb, evb_two, sz_tmp);
EVBUFFER_LENGTH(evb) != sizeof(buffer) * 0.5) if (EVBUFFER_LENGTH(evb_two) != sz_tmp ||
EVBUFFER_LENGTH(evb) != sizeof(buffer) / 2)
goto out; goto out;
if (memcmp(evbuffer_pullup( if (memcmp(evbuffer_pullup(