diff options
| -rw-r--r-- | src/common/compat.c | 1 | ||||
| -rw-r--r-- | src/common/mempool.c | 2 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 1 | ||||
| -rw-r--r-- | src/or/test.c | 3 |
5 files changed, 3 insertions, 6 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 64e9dae5e2..f78c649386 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1002,7 +1002,6 @@ tor_inet_pton(int af, const char *src, void *dst) #endif } - /** Similar behavior to Unix gethostbyname: resolve <b>name</b>, and set * *addr to the proper IP address, in network byte order. Returns 0 * on success, -1 on failure; 1 on transient failure. diff --git a/src/common/mempool.c b/src/common/mempool.c index fa5636f88f..c7c25098ce 100644 --- a/src/common/mempool.c +++ b/src/common/mempool.c @@ -135,7 +135,7 @@ struct mp_chunk_t { */ mp_allocated_t *first_free; int n_allocated; /**< Number of currently allocated items in this chunk. */ - int capacity; /**< Largest number of items that can be fit into this chunk. */ + int capacity; /**< Number of items that can be fit into this chunk. */ size_t mem_size; /**< Number of usable bytes in mem. */ char *next_mem; /**< Pointer into part of <b>mem</b> not yet carved up. */ char mem[1]; /**< Storage for this chunk. (Not actual size.) */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index b2d0cf589f..110057005c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1365,7 +1365,7 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, conn, circ, cpath) < 0) || (!circ && connection_ap_handshake_attach_circuit(conn) < 0)) { - connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);//xxxdup + connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); return -1; } return 0; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 86b502b4c0..31d85a2495 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1862,7 +1862,6 @@ generate_networkstatus_opinion(int v2) !tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs"); memset(&rs, 0, sizeof(rs)); - /* Already set by compute_performance_thresholds. */ rs.is_exit = ri->is_exit; rs.is_stable = ri->is_stable = diff --git a/src/or/test.c b/src/or/test.c index 19db66e8a7..29b6d5c097 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -310,7 +310,6 @@ test_buffers(void) test_memeq(str, (char*)_buf_peek_raw_buffer(buf), 10); /* XXX Check rest. */ test_eq(eof, 0); - i = read_to_buf(s, 1024, buf, &eof); test_eq(i, 0); test_eq(buf_capacity(buf), MAX_BUF_SIZE); @@ -1011,7 +1010,7 @@ _test_eq_ip6(struct in6_addr *a, struct in6_addr *b, const char *e1, r = tor_inet_pton(AF_INET6, b, &a2); \ test_assert(r==1); \ test_eq_ip6(&a1,&a2); \ - } while(0) + } while (0) #define test_pton6_bad(a) \ test_eq(0, tor_inet_pton(AF_INET6, a, &a1)) |