diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2009-09-03 03:01:23 +0200 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-09-15 07:12:12 -0400 |
| commit | 5e01a86b42fe2c975408dd7be0d2d4627c8c2f38 (patch) | |
| tree | b1d8b36616091cb6354881df08ab1bde0dad0ec1 | |
| parent | 39dee3d52c0cba7717289c7f2d2890e98ac5c813 (diff) | |
| download | tor-5e01a86b42fe2c975408dd7be0d2d4627c8c2f38.tar.gz tor-5e01a86b42fe2c975408dd7be0d2d4627c8c2f38.zip | |
some cleanups:
documentation fix for get_uint64
remove extra "." from a log line
fix a long line
| -rw-r--r-- | src/common/compat.c | 4 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 29425c2492..e1a275de11 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -480,8 +480,8 @@ get_uint32(const char *cp) return v; } /** - * Read a 32-bit value beginning at <b>cp</b>. Equivalent to - * *(uint32_t*)(cp), but will not cause segfaults on platforms that forbid + * Read a 64-bit value beginning at <b>cp</b>. Equivalent to + * *(uint64_t*)(cp), but will not cause segfaults on platforms that forbid * unaligned memory access. */ uint64_t diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6f559d9886..c5e020a36b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1504,7 +1504,7 @@ warn_if_last_router_excluded(uint8_t purpose, const extend_info_t *exit) if (routerset_contains_extendinfo(rs, exit)) log_fn(severity, domain, "%s '%s' is in ExcludeNodes%s. Using anyway.", description,exit->nickname, - rs==options->ExcludeNodes?"":" or ExcludeExitNodes."); + rs==options->ExcludeNodes?"":" or ExcludeExitNodes"); return; } diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6a88286b10..f6aef01e85 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1864,7 +1864,7 @@ version_from_platform(const char *platform) * NS_V2 - Output an entry suitable for a V2 NS opinion document * NS_V3_CONSENSUS - Output the first portion of a V3 NS consensus entry * NS_V3_VOTE - Output a complete V3 NS vote - * NS_CONTROL_PORT - Output a NS docunent for the control port + * NS_CONTROL_PORT - Output a NS document for the control port */ int routerstatus_format_entry(char *buf, size_t buf_len, diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 0ed9279002..fd38df4e68 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1910,7 +1910,8 @@ networkstatus_get_param(networkstatus_t *ns, const char *param_name, SMARTLIST_FOREACH_BEGIN(ns->net_params, const char *, p) { if (!strcmpstart(p, param_name) && p[name_len] == '=') { int ok=0; - long v = tor_parse_long(p+name_len+1, 10, INT32_MIN, INT32_MAX, &ok,NULL); + long v = tor_parse_long(p+name_len+1, 10, INT32_MIN, + INT32_MAX, &ok, NULL); if (ok) return (int32_t) v; } |