[tor-commits] [tor/master] nodelist: Move router_get_verbose_nickname() declaration

[asn at torproject.org]

commit 81256c079f0939e1046aa1e905fe488f53c37ded
Author: teor <teor at torproject.org>
Date:   Mon Aug 19 16:26:28 2019 +1000

    nodelist: Move router_get_verbose_nickname() declaration
    
    The declaration was in nodelist/routerinfo.h, but the implementation
    was in nodelist/describe.h.
    
    Part of 21003.
---
 src/feature/control/control_events.c   | 2 +-
 src/feature/control/fmt_serverstatus.c | 2 +-
 src/feature/nodelist/describe.c        | 1 -
 src/feature/nodelist/describe.h        | 2 ++
 src/feature/nodelist/routerinfo.h      | 2 --
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c
index 9e0966ca5..82ea94399 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -26,9 +26,9 @@
 #include "feature/control/control_fmt.h"
 #include "feature/control/control_proto.h"
 #include "feature/dircommon/directory.h"
+#include "feature/nodelist/describe.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "feature/control/control_connection_st.h"
 #include "core/or/entry_connection_st.h"
diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c
index a80bf50ad..33c5ba133 100644
--- a/src/feature/control/fmt_serverstatus.c
+++ b/src/feature/control/fmt_serverstatus.c
@@ -9,8 +9,8 @@
 #include "app/config/config.h"
 #include "feature/dirauth/authmode.h"
 #include "feature/dirauth/voteflags.h"// XXXX remove
+#include "feature/nodelist/describe.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerinfo_st.h"
diff --git a/src/feature/nodelist/describe.c b/src/feature/nodelist/describe.c
index 5c376408c..573669185 100644
--- a/src/feature/nodelist/describe.c
+++ b/src/feature/nodelist/describe.c
@@ -11,7 +11,6 @@
 
 #include "core/or/or.h"
 #include "feature/nodelist/describe.h"
-#include "feature/nodelist/routerinfo.h"
 
 #include "core/or/extend_info_st.h"
 #include "feature/nodelist/node_st.h"
diff --git a/src/feature/nodelist/describe.h b/src/feature/nodelist/describe.h
index d29192200..05f52c47c 100644
--- a/src/feature/nodelist/describe.h
+++ b/src/feature/nodelist/describe.h
@@ -22,4 +22,6 @@ const char *node_describe(const struct node_t *node);
 const char *router_describe(const struct routerinfo_t *ri);
 const char *routerstatus_describe(const struct routerstatus_t *ri);
 
+void router_get_verbose_nickname(char *buf, const routerinfo_t *router);
+
 #endif /* !defined(TOR_DESCRIBE_H) */
diff --git a/src/feature/nodelist/routerinfo.h b/src/feature/nodelist/routerinfo.h
index ca66e660b..8465060f9 100644
--- a/src/feature/nodelist/routerinfo.h
+++ b/src/feature/nodelist/routerinfo.h
@@ -17,8 +17,6 @@ void router_get_prim_orport(const routerinfo_t *router,
 int router_has_orport(const routerinfo_t *router,
                       const tor_addr_port_t *orport);
 
-void router_get_verbose_nickname(char *buf, const routerinfo_t *router);
-
 smartlist_t *router_get_all_orports(const routerinfo_t *ri);
 
 const char *router_purpose_to_string(uint8_t p);