From 043b9de59aec88ae5e29daac7dc2a8b51a9414ce Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Mon, 18 Jul 2022 13:28:40 +0200
Subject: scripted-diff: rename ToStringIP[Port]() to ToStringAddr[Port]()

"IP" stands for "Internet Protocol".

"IP address" is sometimes shortened to just "IP" or "address".

However, Tor or I2P addresses are not "IP addresses", nor "IPs".

Thus, use "Addr" instead of "IP" for addresses that could be IP, Tor or
I2P addresses:

`CService::ToStringIPPort()` -> `CService::ToStringAddrPort()`
`CNetAddr::ToStringIP()` -> `CNetAddr::ToStringAddr()`

-BEGIN VERIFY SCRIPT-
sed -i 's/ToStringIPPort/ToStringAddrPort/g' -- $(git grep -l ToStringIPPort src)
sed -i 's/ToStringIP/ToStringAddr/g' -- $(git grep -l ToStringIP src)
-END VERIFY SCRIPT-
---
 src/netaddress.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/netaddress.cpp')

diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index eabab3dd99..0b554dc3a2 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -599,7 +599,7 @@ std::string OnionToString(Span<const uint8_t> addr)
     return EncodeBase32(address) + ".onion";
 }
 
-std::string CNetAddr::ToStringIP() const
+std::string CNetAddr::ToStringAddr() const
 {
     switch (m_net) {
     case NET_IPV4:
@@ -624,7 +624,7 @@ std::string CNetAddr::ToStringIP() const
 
 std::string CNetAddr::ToString() const
 {
-    return ToStringIP();
+    return ToStringAddr();
 }
 
 bool operator==(const CNetAddr& a, const CNetAddr& b)
@@ -921,18 +921,18 @@ std::string CService::ToStringPort() const
     return strprintf("%u", port);
 }
 
-std::string CService::ToStringIPPort() const
+std::string CService::ToStringAddrPort() const
 {
     if (IsIPv4() || IsTor() || IsI2P() || IsInternal()) {
-        return ToStringIP() + ":" + ToStringPort();
+        return ToStringAddr() + ":" + ToStringPort();
     } else {
-        return "[" + ToStringIP() + "]:" + ToStringPort();
+        return "[" + ToStringAddr() + "]:" + ToStringPort();
     }
 }
 
 std::string CService::ToString() const
 {
-    return ToStringIPPort();
+    return ToStringAddrPort();
 }
 
 CSubNet::CSubNet():
-- 
cgit v1.2.3