diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-04-04 03:34:42 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 14:22:18 -0400 |
| commit | 865bea3b895831a486b024e90f58d72d025ce284 (patch) | |
| tree | 2e41a80cff9959d8b25f896b0d82398ab4b1ea16 /src/or/buffers.c | |
| parent | beb52352f2aeefb69ae2ee67e4e456346e28e40e (diff) | |
| download | tor-865bea3b895831a486b024e90f58d72d025ce284.tar tor-865bea3b895831a486b024e90f58d72d025ce284.tar.gz | |
Some bufferevents related fixes and pointers for nickm
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index eaa742784..a256f29c0 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1017,7 +1017,7 @@ fetch_var_cell_from_buf(buf_t *buf, var_cell_t **out, int linkproto) #ifdef USE_BUFFEREVENTS /** Try to read <b>n</b> bytes from <b>buf</b> at <b>pos</b> (which may be - * NULL for the start fo the buffer), copying the data only if necessary. Set + * NULL for the start of the buffer), copying the data only if necessary. Set * *<b>data</b> to a pointer to the desired bytes. Set <b>free_out</b> to 1 * if we needed to malloc *<b>data</b> because the original bytes were * noncontiguous; 0 otherwise. Return the number of bytes actually available @@ -1359,6 +1359,7 @@ fetch_from_buf_http(buf_t *buf, } #ifdef USE_BUFFEREVENTS +/** As fetch_from_buf_http, buf works on an evbuffer. */ int fetch_from_evbuffer_http(struct evbuffer *buf, char **headers_out, size_t max_headerlen, @@ -1564,7 +1565,7 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, * at a buffer's contents, we look at the <b>datalen</b> bytes of data in * <b>data</b>. Instead of removing data from the buffer, we set * <b>drain_out</b> to the amount of data that should be removed (or -1 if the - * buffer should be cleared. Instead of pulling more data into the first + * buffer should be cleared). Instead of pulling more data into the first * chunk of the buffer, we set *<b>want_length_out</b> to the number of bytes * we'd like to see in the input buffer. */ static int |