summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-06-19 01:28:40 -0700
committerRobert Ransom <rransom.8774@gmail.com>2011-06-22 14:09:43 -0700
commitd7254bea11a0fc2685cc2ea24fb57d2ab3945b2f (patch)
tree2a1a0cda35b41780c2dfe88c6d46e864d580e2e3
parent8a55da57ed17dfb9cefe3193cbda53a15547630e (diff)
downloadtor-d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f.tar.gz
tor-d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f.zip
Fix minor comment issues
-rw-r--r--src/common/compat.c2
-rw-r--r--src/or/connection.c6
-rw-r--r--src/or/or.h6
-rw-r--r--src/test/Makefile.am2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 9377959eb4..c9839255d4 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -415,7 +415,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
*
* This function is <em>not</em> timing-safe.
*
- * Requires that nlen be greater than zero.
+ * Requires that <b>nlen</b> be greater than zero.
*/
const void *
tor_memmem(const void *_haystack, size_t hlen,
diff --git a/src/or/connection.c b/src/or/connection.c
index a9e3a74ed6..b2412a2a34 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2751,15 +2751,15 @@ connection_outbuf_too_full(connection_t *conn)
return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE);
}
-/** Try to flush more bytes onto conn-\>s.
+/** Try to flush more bytes onto <b>conn</b>-\>s.
*
* This function gets called either from conn_write() in main.c
* when poll() has declared that conn wants to write, or below
* from connection_write_to_buf() when an entire TLS record is ready.
*
- * Update conn-\>timestamp_lastwritten to now, and call flush_buf
+ * Update <b>conn</b>-\>timestamp_lastwritten to now, and call flush_buf
* or flush_buf_tls appropriately. If it succeeds and there are no more
- * more bytes on conn->outbuf, then call connection_finished_flushing
+ * more bytes on <b>conn</b>-\>outbuf, then call connection_finished_flushing
* on it too.
*
* If <b>force</b>, then write as many bytes as possible, ignoring bandwidth
diff --git a/src/or/or.h b/src/or/or.h
index 97fecd1500..1909887bbd 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2318,14 +2318,14 @@ typedef struct or_circuit_t {
cell_ewma_t p_cell_ewma;
} or_circuit_t;
-/** Convert a circuit subtype to a circuit_t.*/
+/** Convert a circuit subtype to a circuit_t. */
#define TO_CIRCUIT(x) (&((x)->_base))
-/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts
+/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert
* if the cast is impossible. */
static or_circuit_t *TO_OR_CIRCUIT(circuit_t *);
/** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t.
- * Asserts if the cast is impossible. */
+ * Assert if the cast is impossible. */
static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *);
static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 546fa2f4b7..904719d94b 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-I"$(top_srcdir)/src/or"
# -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
-# This seems to matter nowhere but on windows, but I assure you that it
+# This seems to matter nowhere but on Windows, but I assure you that it
# matters a lot there, and is quite hard to debug if you forget to do it.
test_SOURCES = \