aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2018-02-09 17:05:20 -0500
committerRoger Dingledine <arma@torproject.org>2018-02-09 17:05:20 -0500
commit99666dc6c4edb7614abc001d92326ca59c23f5f5 (patch)
tree10c5a562917e4d5ef6dac7841e6e31298da7b3ae
parentd95c7c7f529fc1be2cf6a474915f065fd2eb6f41 (diff)
downloadtor-99666dc6c4edb7614abc001d92326ca59c23f5f5.tar.gz
tor-99666dc6c4edb7614abc001d92326ca59c23f5f5.zip
whitespace and typo cleanups
-rw-r--r--src/common/address_set.c6
-rw-r--r--src/common/address_set.h2
-rw-r--r--src/or/hs_circuit.c2
-rw-r--r--src/or/replaycache.c11
4 files changed, 7 insertions, 14 deletions
diff --git a/src/common/address_set.c b/src/common/address_set.c
index 6fa942b0dc..ea48c1638e 100644
--- a/src/common/address_set.c
+++ b/src/common/address_set.c
@@ -34,7 +34,7 @@
* independent siphashes rather than messing around with bit-shifts. The
* approach here is probably more sound, and we should prefer it if&when we
* unify the implementations.
- **/
+ */
struct address_set_t {
/** siphash keys to make N_HASHES independent hashes for each address. */
@@ -63,7 +63,7 @@ address_set_new(int max_addresses_guess)
}
/**
- * Release all storage associated with <b>set</b>
+ * Release all storage associated with <b>set</b>.
*/
void
address_set_free(address_set_t *set)
@@ -107,7 +107,7 @@ address_set_add_ipv4h(address_set_t *set, uint32_t addr)
}
/**
- * Return true if <b>addr</b> if a member of <b>set</b>. (And probably,
+ * Return true if <b>addr</b> is a member of <b>set</b>. (And probably,
* return false if <b>addr</b> is not a member of set.)
*/
int
diff --git a/src/common/address_set.h b/src/common/address_set.h
index aedf17fc66..28d29f3fdf 100644
--- a/src/common/address_set.h
+++ b/src/common/address_set.h
@@ -2,7 +2,7 @@
/* See LICENSE for licensing information */
/**
- * \file addressset.h
+ * \file address_set.h
* \brief Types to handle sets of addresses.
*
* This module was first written on a semi-emergency basis to improve the
diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index faa4b5d450..3a674f6223 100644
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -722,7 +722,7 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t *circ)
* circuit to the same rendezvous point at the same time. */
circ->hs_service_side_rend_circ_has_been_relaunched = 1;
- /* Legacy service don't have a hidden service ident. */
+ /* Legacy services don't have a hidden service ident. */
if (circ->hs_ident) {
retry_service_rendezvous_point(circ);
} else {
diff --git a/src/or/replaycache.c b/src/or/replaycache.c
index 4a56bfd7d4..a9a6709937 100644
--- a/src/or/replaycache.c
+++ b/src/or/replaycache.c
@@ -26,7 +26,6 @@
/** Free the replaycache r and all of its entries.
*/
-
void
replaycache_free_(replaycache_t *r)
{
@@ -44,7 +43,6 @@ replaycache_free_(replaycache_t *r)
* for entries to age out and interval is the time after which the cache
* should be scrubbed for old entries.
*/
-
replaycache_t *
replaycache_new(time_t horizon, time_t interval)
{
@@ -72,9 +70,8 @@ replaycache_new(time_t horizon, time_t interval)
return r;
}
-/** See documentation for replaycache_add_and_test()
+/** See documentation for replaycache_add_and_test().
*/
-
STATIC int
replaycache_add_and_test_internal(
time_t present, replaycache_t *r, const void *data, size_t len,
@@ -136,9 +133,8 @@ replaycache_add_and_test_internal(
return rv;
}
-/** See documentation for replaycache_scrub_if_needed()
+/** See documentation for replaycache_scrub_if_needed().
*/
-
STATIC void
replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r)
{
@@ -186,7 +182,6 @@ replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r)
* and the function will return 1 if it was already seen within the cache's
* horizon, or 0 otherwise.
*/
-
int
replaycache_add_and_test(replaycache_t *r, const void *data, size_t len)
{
@@ -196,7 +191,6 @@ replaycache_add_and_test(replaycache_t *r, const void *data, size_t len)
/** Like replaycache_add_and_test(), but if it's a hit also return the time
* elapsed since this digest was last seen.
*/
-
int
replaycache_add_test_and_elapsed(
replaycache_t *r, const void *data, size_t len, time_t *elapsed)
@@ -207,7 +201,6 @@ replaycache_add_test_and_elapsed(
/** Scrub aged entries out of r if sufficiently long has elapsed since r was
* last scrubbed.
*/
-
void
replaycache_scrub_if_needed(replaycache_t *r)
{