Make _with_err return routerinfo, like old function does

1 files changed, 11 insertions, 12 deletions

diff --git a/src/or/policies.c b/src/or/policies.c
index 15176a97e4..4d47985ec5 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2999,9 +2999,8 @@ getinfo_helper_policies(control_connection_t *conn,
     smartlist_free(private_policy_strings);
   } else if (!strcmp(question, "exit-policy/reject-private/relay")) {
     const or_options_t *options = get_options();
-    const routerinfo_t *me = NULL;
-
-    int err = router_get_my_routerinfo_with_err((routerinfo_t **)&me);
+    int err = 0;
+    const routerinfo_t *me = router_get_my_routerinfo_with_err(&err);
 
     if (!me) {
       *errmsg = routerinfo_errno_to_string(err);
@@ -3043,8 +3042,13 @@ getinfo_helper_policies(control_connection_t *conn,
     int include_ipv4 = 0;
     int include_ipv6 = 0;
 
-    const routerinfo_t *me = NULL;
-    int err = router_get_my_routerinfo_with_err((routerinfo_t **)&me);
+    int err = 0;
+    const routerinfo_t *me = router_get_my_routerinfo_with_err(&err);
+
+    if (!me) {
+      *errmsg = routerinfo_errno_to_string(err);
+      return routerinfo_err_is_transient(err) ? -1 : 0;
+    }
 
     if (!strcmp(question, "exit-policy/ipv4")) {
       include_ipv4 = 1;
@@ -3056,13 +3060,8 @@ getinfo_helper_policies(control_connection_t *conn,
       return 0; /* No such key. */
     }
 
-    if (!me) {
-      *errmsg = routerinfo_errno_to_string(err);
-      return routerinfo_err_is_transient(err) ? -1 : 0;
-    } else {
-      *answer = router_dump_exit_policy_to_string(me,include_ipv4,
-                                                  include_ipv6);
-    }
+    *answer = router_dump_exit_policy_to_string(me,include_ipv4,
+                                                include_ipv6);
   }
 
   return 0;