diff options
| -rw-r--r-- | src/or/buffers.c | 5 | ||||
| -rw-r--r-- | src/or/include.am | 1 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 | ||||
| -rw-r--r-- | src/test/test_buffers.c | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 01a1b1f366..cc2f6f409b 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -178,13 +178,10 @@ preferred_chunk_size(size_t target) /** Collapse data from the first N chunks from <b>buf</b> into buf->head, * growing it as necessary, until buf->head has the first <b>bytes</b> bytes * of data from the buffer, or until buf->head has all the data in <b>buf</b>. - * - * If <b>nulterminate</b> is true, ensure that there is a 0 byte in - * buf->head->mem right after all the data. */ + */ STATIC void buf_pullup(buf_t *buf, size_t bytes) { - /* XXXX nothing uses nulterminate; remove it. */ chunk_t *dest, *src; size_t capacity; if (!buf->head) diff --git a/src/or/include.am b/src/or/include.am index 959b26dcf9..7b12b56eb1 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -153,6 +153,7 @@ ORHEADERS = \ src/or/dirserv.h \ src/or/dirvote.h \ src/or/dns.h \ + src/or/dns_structs.h \ src/or/dnsserv.h \ src/or/eventdns_tor.h \ src/or/ext_orport.h \ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f3a09ddaf2..8ba5327b1d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1762,7 +1762,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /** Given a parsed and decrypted INTRODUCE2, find the rendezvous point or * return NULL and an error string if we can't. Return a newly allocated - * extend_info_t* for the introduction point. */ + * extend_info_t* for the rendezvous point. */ static extend_info_t * find_rp_for_intro(const rend_intro_cell_t *intro, char **err_msg_out) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 4b6e5399fd..29ee408616 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -206,9 +206,6 @@ test_buffer_pullup(void *arg) stuff = tor_malloc(16384); tmp = tor_malloc(16384); - /* Note: this test doesn't check the nulterminate argument to buf_pullup, - since nothing actually uses it. We should remove it some time. */ - buf = buf_new_with_capacity(3000); /* rounds up to next power of 2. */ tt_assert(buf); |