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

r15551@tombo: nickm | 2008-05-08 14:49:20 -0400

Browse Source 
Use _get_ convention for new accessor functions.  (These are all new ones as of 2.0, I believe).


svn:r799
This commit is contained in:
Nick Mathewson 2008-05-08 22:51:39 +00:00
parent 7defe4cbc1
commit 8acb80b4f9
9 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buffer.c
View File

@ -118,13 +118,13 @@ evbuffer_free(struct evbuffer *buffer)
} }
size_t size_t
evbuffer_length(struct evbuffer *buffer) evbuffer_get_length(struct evbuffer *buffer)
{ {
return (buffer->total_len); return (buffer->total_len);
} }
size_t size_t
evbuffer_contiguous_space(struct evbuffer *buf) evbuffer_get_contiguous_space(struct evbuffer *buf)
{ {
struct evbuffer_chain *chain = buf->first; struct evbuffer_chain *chain = buf->first;

4
bufferevent.c
View File

@ -360,13 +360,13 @@ bufferevent_setfd(struct bufferevent *bufev, evutil_socket_t fd)
} }
struct evbuffer * struct evbuffer *
bufferevent_input(struct bufferevent *bufev) bufferevent_get_input(struct bufferevent *bufev)
{ {
return (bufev->input); return (bufev->input);
} }
struct evbuffer * struct evbuffer *
bufferevent_output(struct bufferevent *bufev) bufferevent_get_output(struct bufferevent *bufev)
{ {
return TAILQ_FIRST(&bufev->output_filters) != NULL ? return TAILQ_FIRST(&bufev->output_filters) != NULL ?
TAILQ_FIRST(&bufev->output_filters)->buffer : TAILQ_FIRST(&bufev->output_filters)->buffer :

2
event.c
View File

@ -345,7 +345,7 @@ event_reinit(struct event_base *base)
} }
const char ** const char **
event_supported_methods() event_get_supported_methods(void)
{ {
static const char **methods; static const char **methods;
const struct eventop **method; const struct eventop **method;

14
http.c
View File

@ -322,7 +322,7 @@ evhttp_make_header_request(struct evhttp_connection *evcon,
/* Generate request line */ /* Generate request line */
method = evhttp_method(req->type); method = evhttp_method(req->type);
evbuffer_add_printf(bufferevent_output(evcon->bufev), evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
"%s %s HTTP/%d.%d\r\n", "%s %s HTTP/%d.%d\r\n",
method, req->uri, req->major, req->minor); method, req->uri, req->major, req->minor);
@ -400,7 +400,7 @@ static void
evhttp_make_header_response(struct evhttp_connection *evcon, evhttp_make_header_response(struct evhttp_connection *evcon,
struct evhttp_request *req) struct evhttp_request *req)
{ {
evbuffer_add_printf(bufferevent_output(evcon->bufev), evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
"HTTP/%d.%d %d %s\r\n", "HTTP/%d.%d %d %s\r\n",
req->major, req->minor, req->response_code, req->major, req->minor, req->response_code,
req->response_code_line); req->response_code_line);
@ -442,7 +442,7 @@ void
evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req) evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req)
{ {
struct evkeyval *header; struct evkeyval *header;
struct evbuffer *output = bufferevent_output(evcon->bufev); struct evbuffer *output = bufferevent_get_output(evcon->bufev);
/* /*
* Depending if this is a HTTP request or response, we might need to * Depending if this is a HTTP request or response, we might need to
@ -670,7 +670,7 @@ evhttp_handle_chunked_read(struct evhttp_request *req, struct evbuffer *buf)
static void static void
evhttp_read_body(struct evhttp_connection *evcon, struct evhttp_request *req) evhttp_read_body(struct evhttp_connection *evcon, struct evhttp_request *req)
{ {
struct evbuffer *buf = bufferevent_input(evcon->bufev); struct evbuffer *buf = bufferevent_get_input(evcon->bufev);
if (req->chunked) { if (req->chunked) {
int res = evhttp_handle_chunked_read(req, buf); int res = evhttp_handle_chunked_read(req, buf);
@ -1333,7 +1333,7 @@ evhttp_read_header_cb(struct bufferevent *bufev, void *arg)
int res; int res;
int fd = evcon->fd; int fd = evcon->fd;
res = evhttp_parse_lines(req, bufferevent_input(evcon->bufev)); res = evhttp_parse_lines(req, bufferevent_get_input(evcon->bufev));
if (res == -1) { if (res == -1) {
/* Error while reading, terminate */ /* Error while reading, terminate */
event_debug(("%s: bad header lines on %d\n", __func__, fd)); event_debug(("%s: bad header lines on %d\n", __func__, fd));
@ -1697,7 +1697,7 @@ evhttp_send_reply_start(struct evhttp_request *req, int code,
void void
evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf) evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf)
{ {
struct evbuffer *output = bufferevent_output(req->evcon->bufev); struct evbuffer *output = bufferevent_get_output(req->evcon->bufev);
if (req->chunked) { if (req->chunked) {
evbuffer_add_printf(output, "%x\r\n", evbuffer_add_printf(output, "%x\r\n",
(unsigned)EVBUFFER_LENGTH(databuf)); (unsigned)EVBUFFER_LENGTH(databuf));
@ -1713,7 +1713,7 @@ void
evhttp_send_reply_end(struct evhttp_request *req) evhttp_send_reply_end(struct evhttp_request *req)
{ {
struct evhttp_connection *evcon = req->evcon; struct evhttp_connection *evcon = req->evcon;
struct evbuffer *output = bufferevent_output(evcon->bufev); struct evbuffer *output = bufferevent_get_output(evcon->bufev);
if (req->chunked) { if (req->chunked) {
evbuffer_add(output, "0\r\n\r\n", 5); evbuffer_add(output, "0\r\n\r\n", 5);

7
include/event2/buffer.h
View File

@ -91,7 +91,7 @@ void evbuffer_free(struct evbuffer *buf);
@param buf pointer to the evbuffer @param buf pointer to the evbuffer
@return the number of bytes stored in the event buffer @return the number of bytes stored in the event buffer
*/ */
size_t evbuffer_length(struct evbuffer *buf); size_t evbuffer_get_length(struct evbuffer *buf);
/** /**
Returns the contiguous number of available bytes in the first buffer chain. Returns the contiguous number of available bytes in the first buffer chain.
@ -104,7 +104,7 @@ size_t evbuffer_length(struct evbuffer *buf);
@return 0 if no data is available, otherwise the number of available bytes @return 0 if no data is available, otherwise the number of available bytes
in the first buffer chain. in the first buffer chain.
*/ */
size_t evbuffer_contiguous_space(struct evbuffer *buf); size_t evbuffer_get_contiguous_space(struct evbuffer *buf);
/** /**
Expands the available space in an event buffer. Expands the available space in an event buffer.
@ -362,10 +362,9 @@ void evbuffer_prepend_buffer(struct evbuffer *dst, struct evbuffer* src);
*/ */
/** deprecated in favor of calling the functions directly */ /** deprecated in favor of calling the functions directly */
#define EVBUFFER_LENGTH(x) evbuffer_length(x) #define EVBUFFER_LENGTH(x) evbuffer_get_length(x)
#define EVBUFFER_DATA(x) evbuffer_pullup(x, -1) #define EVBUFFER_DATA(x) evbuffer_pullup(x, -1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

8
include/event2/bufferevent.h
View File

@ -251,7 +251,7 @@ int bufferevent_read_buffer(struct bufferevent *bufev, struct evbuffer *buf);
@return the evbuffer object for the input buffer @return the evbuffer object for the input buffer
*/ */
struct evbuffer *bufferevent_input(struct bufferevent *bufev); struct evbuffer *bufferevent_get_input(struct bufferevent *bufev);
/** /**
Returns the outut buffer. Returns the outut buffer.
@ -263,7 +263,7 @@ struct evbuffer *bufferevent_input(struct bufferevent *bufev);
@return the evbuffer object for the output buffer @return the evbuffer object for the output buffer
*/ */
struct evbuffer *bufferevent_output(struct bufferevent *bufev); struct evbuffer *bufferevent_get_output(struct bufferevent *bufev);
/** /**
Enable a bufferevent. Enable a bufferevent.
@ -316,9 +316,9 @@ void bufferevent_setwatermark(struct bufferevent *bufev, short events,
size_t lowmark, size_t highmark); size_t lowmark, size_t highmark);
/** macro for getting access to the input buffer of a bufferevent */ /** macro for getting access to the input buffer of a bufferevent */
#define EVBUFFER_INPUT(x) bufferevent_input(x) #define EVBUFFER_INPUT(x) bufferevent_get_input(x)
/** macro for getting access to the output buffer of a bufferevent */ /** macro for getting access to the output buffer of a bufferevent */
#define EVBUFFER_OUTPUT(x) bufferevent_output(x) #define EVBUFFER_OUTPUT(x) bufferevent_get_output(x)
/** /**
Support for filtering input and output of bufferevents. Support for filtering input and output of bufferevents.

2
include/event2/event.h
View File

@ -110,7 +110,7 @@ const char *event_base_get_method(struct event_base *);
The end of the array is indicated by a NULL pointer. If an The end of the array is indicated by a NULL pointer. If an
error is encountered NULL is returned. error is encountered NULL is returned.
*/ */
const char **event_supported_methods(void); const char **event_get_supported_methods(void);
/** /**
Allocates a new event configuration object. Allocates a new event configuration object.

4
test/regress.c
View File

@ -1074,7 +1074,7 @@ test_evbuffer(void)
assert(evbuffer_commit_space(evb, 10000) == 0); assert(evbuffer_commit_space(evb, 10000) == 0);
evbuffer_validate(evb); evbuffer_validate(evb);
assert(evbuffer_length(evb) >= 10000); assert(evbuffer_get_length(evb) >= 10000);
evbuffer_drain(evb, j * 5000); evbuffer_drain(evb, j * 5000);
evbuffer_validate(evb); evbuffer_validate(evb);
@ -2069,7 +2069,7 @@ test_evutil_strtoll(void)
static void static void
test_methods(void) test_methods(void)
{ {
const char **methods = event_supported_methods(); const char **methods = event_get_supported_methods();
struct event_config *cfg; struct event_config *cfg;
struct event_base *base; struct event_base *base;
const char *backend; const char *backend;

12
test/regress_zlib.c
View File

@ -113,7 +113,7 @@ zlib_input_filter(struct evbuffer *src, struct evbuffer *dst,
do { do {
/* let's do some decompression */ /* let's do some decompression */
p->avail_in = evbuffer_contiguous_space(src); p->avail_in = evbuffer_get_contiguous_space(src);
p->next_in = evbuffer_pullup(src, p->avail_in); p->next_in = evbuffer_pullup(src, p->avail_in);
p->next_out = evbuffer_reserve_space(dst, 4096); p->next_out = evbuffer_reserve_space(dst, 4096);
@ -125,7 +125,7 @@ zlib_input_filter(struct evbuffer *src, struct evbuffer *dst,
assert(res == Z_OK || res == Z_STREAM_END); assert(res == Z_OK || res == Z_STREAM_END);
/* let's figure out how much was compressed */ /* let's figure out how much was compressed */
nread = evbuffer_contiguous_space(src) - p->avail_in; nread = evbuffer_get_contiguous_space(src) - p->avail_in;
nwrite = 4096 - p->avail_out; nwrite = 4096 - p->avail_out;
evbuffer_drain(src, nread); evbuffer_drain(src, nread);
@ -148,7 +148,7 @@ zlib_output_filter(struct evbuffer *src, struct evbuffer *dst,
do { do {
/* let's do some compression */ /* let's do some compression */
p->avail_in = evbuffer_contiguous_space(src); p->avail_in = evbuffer_get_contiguous_space(src);
p->next_in = evbuffer_pullup(src, p->avail_in); p->next_in = evbuffer_pullup(src, p->avail_in);
p->next_out = evbuffer_reserve_space(dst, 4096); p->next_out = evbuffer_reserve_space(dst, 4096);
@ -159,7 +159,7 @@ zlib_output_filter(struct evbuffer *src, struct evbuffer *dst,
assert(res == Z_OK || res == Z_STREAM_END); assert(res == Z_OK || res == Z_STREAM_END);
/* let's figure out how much was compressed */ /* let's figure out how much was compressed */
nread = evbuffer_contiguous_space(src) - p->avail_in; nread = evbuffer_get_contiguous_space(src) - p->avail_in;
nwrite = 4096 - p->avail_out; nwrite = 4096 - p->avail_out;
evbuffer_drain(src, nread); evbuffer_drain(src, nread);
@ -178,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(bufferevent_input(bev)) == 8333) { if (EVBUFFER_LENGTH(bufferevent_get_input(bev)) == 8333) {
struct evbuffer *evbuf = evbuffer_new(); struct evbuffer *evbuf = evbuffer_new();
assert(evbuf != NULL); assert(evbuf != NULL);
@ -197,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(bufferevent_output(bev)) == 0) if (EVBUFFER_LENGTH(bufferevent_get_output(bev)) == 0)
test_ok++; test_ok++;
} }