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

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2011-07-02 21:50:49 -04:00
commit 2bbed8fe2a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bufferevent_pair.c
View File

@ -158,7 +158,7 @@ be_pair_transfer(struct bufferevent *src, struct bufferevent *dst,
evbuffer_unfreeze(dst->input, 0); evbuffer_unfreeze(dst->input, 0);
if (dst->wm_read.high) { if (dst->wm_read.high) {
size_t dst_size = evbuffer_get_length(dst->input); dst_size = evbuffer_get_length(dst->input);
if (dst_size < dst->wm_read.high) { if (dst_size < dst->wm_read.high) {
n = dst->wm_read.high - dst_size; n = dst->wm_read.high - dst_size;
evbuffer_remove_buffer(src->output, dst->input, n); evbuffer_remove_buffer(src->output, dst->input, n);

2
event-internal.h
View File

@ -315,10 +315,12 @@ struct event_config {
#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
#endif #endif
#ifndef TAILQ_FOREACH
#define TAILQ_FOREACH(var, head, field) \ #define TAILQ_FOREACH(var, head, field) \
for ((var) = TAILQ_FIRST(head); \ for ((var) = TAILQ_FIRST(head); \
(var) != TAILQ_END(head); \ (var) != TAILQ_END(head); \
(var) = TAILQ_NEXT(var, field)) (var) = TAILQ_NEXT(var, field))
#endif
#ifndef TAILQ_INSERT_BEFORE #ifndef TAILQ_INSERT_BEFORE
#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ #define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \

6
evutil.c
View File

@ -54,15 +54,15 @@
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _EVENT_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifdef _EVENT_HAVE_NETINET_IN_H #ifdef _EVENT_HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifdef _EVENT_HAVE_NETINET_IN6_H #ifdef _EVENT_HAVE_NETINET_IN6_H
#include <netinet/in6.h> #include <netinet/in6.h>
#endif #endif
#ifdef _EVENT_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifndef _EVENT_HAVE_GETTIMEOFDAY #ifndef _EVENT_HAVE_GETTIMEOFDAY
#include <sys/timeb.h> #include <sys/timeb.h>

4
ht-internal.h
View File

@ -223,7 +223,6 @@ ht_string_hash(const char *s)
void *data) \ void *data) \
{ \ { \
unsigned idx; \ unsigned idx; \
int remove; \
struct type **p, **nextp, *next; \ struct type **p, **nextp, *next; \
if (!head->hth_table) \ if (!head->hth_table) \
return; \ return; \
@ -232,8 +231,7 @@ ht_string_hash(const char *s)
while (*p) { \ while (*p) { \
nextp = &(*p)->field.hte_next; \ nextp = &(*p)->field.hte_next; \
next = *nextp; \ next = *nextp; \
remove = fn(*p, data); \ if (fn(*p, data)) { \
if (remove) { \
--head->hth_n_entries; \ --head->hth_n_entries; \
*p = next; \ *p = next; \
} else { \ } else { \