Avoid confusion with errno from libc

diff --git a/src/or/policies.c b/src/or/policies.c
index 4d47985ec552a45473699a1f1107356240d7de47..1210ca687d527b5c0e6ce4fdccc6e6c79c02cb29 100644 (file)
--- 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 7bf40d69d01b400cadc1c80e021f8155b6ad88c4..f88ba37469f35cede13a93ec0daa8e338cb56c8c 100644 (file)
--- 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 561802c2cdef1ce01d0e12378f71e7641633aca1..9befffae5909bd38fb7b4ff75123e48b47ce4ad3 100644 (file)
--- 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);