nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid confusion with errno from libc

Browse Source
This commit is contained in:
rl1987 2018-05-10 16:33:08 +03:00
parent 36f7d0a940
commit 8ad97b7dcf
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/policies.c
View File

@ -3003,7 +3003,7 @@ getinfo_helper_policies(control_connection_t *conn,
const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); const routerinfo_t *me = router_get_my_routerinfo_with_err(&err);
if (!me) { if (!me) {
*errmsg = routerinfo_errno_to_string(err); *errmsg = routerinfo_err_to_string(err);
return routerinfo_err_is_transient(err) ? -1 : 0; return routerinfo_err_is_transient(err) ? -1 : 0;
} }
@ -3046,7 +3046,7 @@ getinfo_helper_policies(control_connection_t *conn,
const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); const routerinfo_t *me = router_get_my_routerinfo_with_err(&err);
if (!me) { if (!me) {
*errmsg = routerinfo_errno_to_string(err); *errmsg = routerinfo_err_to_string(err);
return routerinfo_err_is_transient(err) ? -1 : 0; return routerinfo_err_is_transient(err) ? -1 : 0;
} }

2
src/or/router.c
View File

@ -118,7 +118,7 @@ const char *format_node_description(char *buf,
* of <b>err</b>. * of <b>err</b>.
*/ */
const char * const char *
routerinfo_errno_to_string(int err) routerinfo_err_to_string(int err)
{ {
switch (err) { switch (err) {
case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR: case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR:

2
src/or/router.h
View File

@ -135,7 +135,7 @@ const char *node_describe(const node_t *node);
const char *routerstatus_describe(const routerstatus_t *ri); const char *routerstatus_describe(const routerstatus_t *ri);
const char *extend_info_describe(const extend_info_t *ei); const char *extend_info_describe(const extend_info_t *ei);
const char *routerinfo_errno_to_string(int err); const char *routerinfo_err_to_string(int err);
int routerinfo_err_is_transient(int err); int routerinfo_err_is_transient(int err);
void router_get_verbose_nickname(char *buf, const routerinfo_t *router); void router_get_verbose_nickname(char *buf, const routerinfo_t *router);