[tor-commits] [tor/master] Avoid confusion with errno from libc

[nickm@xxxxxxxxxxxxxx]

commit 8ad97b7dcf143fc488422f9866613fea3d900119
Author: rl1987 <rl1987@xxxxxxxxxxxxxxxx>
Date:   Thu May 10 16:33:08 2018 +0300

    Avoid confusion with errno from libc
---
 src/or/policies.c | 4 ++--
 src/or/router.c   | 2 +-
 src/or/router.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index 4d47985ec..1210ca687 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -3003,7 +3003,7 @@ getinfo_helper_policies(control_connection_t *conn,
     const routerinfo_t *me = router_get_my_routerinfo_with_err(&err);
 
     if (!me) {
-      *errmsg = routerinfo_errno_to_string(err);
+      *errmsg = routerinfo_err_to_string(err);
       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);
 
     if (!me) {
-      *errmsg = routerinfo_errno_to_string(err);
+      *errmsg = routerinfo_err_to_string(err);
       return routerinfo_err_is_transient(err) ? -1 : 0;
     }
 
diff --git a/src/or/router.c b/src/or/router.c
index 7bf40d69d..f88ba3746 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -118,7 +118,7 @@ const char *format_node_description(char *buf,
  * of <b>err</b>.
  */
 const char *
-routerinfo_errno_to_string(int err)
+routerinfo_err_to_string(int err)
 {
   switch (err) {
     case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR:
diff --git a/src/or/router.h b/src/or/router.h
index 561802c2c..9befffae5 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -135,7 +135,7 @@ const char *node_describe(const node_t *node);
 const char *routerstatus_describe(const routerstatus_t *ri);
 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);
 
 void router_get_verbose_nickname(char *buf, const routerinfo_t *router);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits