mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
some cleanups:
documentation fix for get_uint64 remove extra "." from a log line fix a long line
This commit is contained in:
committed by
Roger Dingledine
parent
39dee3d52c
commit
5e01a86b42
+2
-2
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user