summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-02-06 02:49:07 +0000
committerRoger Dingledine <arma@torproject.org>2007-02-06 02:49:07 +0000
commit4ba57f68e4288969226e2e3f21922e1bf338f6f1 (patch)
tree4c1947283a4892d9ce3f7d6aa5104ad7e1f1a990 /src/or/control.c
parentbbfb6508e7297021d1734754de055cf8810c268d (diff)
downloadtor-4ba57f68e4288969226e2e3f21922e1bf338f6f1.tar.gz
tor-4ba57f68e4288969226e2e3f21922e1bf338f6f1.zip
more changes. i'm all caught up now.
svn:r9495
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/or/control.c b/src/or/control.c
index c7ee25b8cb..cbea14f22c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -635,10 +635,10 @@ send_control0_event(uint16_t event, uint32_t len, const char *body)
*
* If <b>which</b> & SHORT_NAMES, the event contains short-format names: send
* it to controllers that haven't enabled the VERBOSE_NAMES feature. If
- * <b>which</b> & LONG_NAMES, the event contains long-format names: sent it
+ * <b>which</b> & LONG_NAMES, the event contains long-format names: send it
* to contollers that <em>have</em> enabled VERBOSE_NAMES.
*
- * The EXTENDED_FORMAT and NONEXTENDED_FORMAT flags behaves similarly with
+ * The EXTENDED_FORMAT and NONEXTENDED_FORMAT flags behave similarly with
* respect to the EXTENDED_EVENTS feature. */
static void
send_control1_event_string(uint16_t event, event_format_t which,
@@ -3136,7 +3136,7 @@ write_stream_target_to_buf(edge_connection_t *conn, char *buf, size_t len)
}
/** Convert the reason for ending a stream <b>reason</b> into the format used
- * in STREAM events. Return NULL if the reason is unrecognized.*/
+ * in STREAM events. Return NULL if the reason is unrecognized. */
static const char *
stream_end_reason_to_string(int reason)
{
@@ -3663,9 +3663,9 @@ control_event_my_descriptor_changed(void)
return 0;
}
-/** Helper: sents a status event where <b>type</b> is one of
+/** Helper: sends a status event where <b>type</b> is one of
* EVENT_STATUS_{GENERAL,CLIENT,SERVER}, where <b>severity</b> is one of
- * LOG_{NOTICE,WARN,ERR}, and where <b>format</b> is a print-style format
+ * LOG_{NOTICE,WARN,ERR}, and where <b>format</b> is a printf-style format
* string corresponding to <b>args</b>. */
static int
control_event_status(int type, int severity, const char *format, va_list args)
@@ -3712,7 +3712,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
}
/** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained
- * by formatting the arguments using the printf-style <b>format</b> */
+ * by formatting the arguments using the printf-style <b>format</b>. */
int
control_event_general_status(int severity, const char *format, ...)
{
@@ -3728,7 +3728,7 @@ control_event_general_status(int severity, const char *format, ...)
}
/** Format and send an EVENT_STATUS_CLIENT event whose main text is obtained
- * by formatting the arguments using the printf-style <b>format</b> */
+ * by formatting the arguments using the printf-style <b>format</b>. */
int
control_event_client_status(int severity, const char *format, ...)
{
@@ -3744,7 +3744,7 @@ control_event_client_status(int severity, const char *format, ...)
}
/** Format and send an EVENT_STATUS_SERVER event whose main text is obtained
- * by formatting the arguments using the printf-style <b>format</b> */
+ * by formatting the arguments using the printf-style <b>format</b>. */
int
control_event_server_status(int severity, const char *format, ...)
{
@@ -3761,7 +3761,7 @@ control_event_server_status(int severity, const char *format, ...)
/** Called when the status of an entry guard with the given <b>nickname</b>
* and identity <b>digest</b> has changed to <b>status</b>: tells any
- * controllers that care. */
+ * controllers that care. */
int
control_event_guard(const char *nickname, const char *digest,
const char *status)