From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Feb 2019 10:57:51 +0000 (-0600)
Subject: msg/msg_types: drop any: prefix
X-Git-Tag: v14.1.0~184^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37e4f613d515d495c8df9b41c00846bc5b4b6cc1;p=ceph.git

msg/msg_types: drop any: prefix

If it can be any type of address, then simply don't specify the type.  This
is less confusing for humans.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index 705b59575f7f..62ca036e2259 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -180,8 +180,10 @@ ostream& operator<<(ostream& out, const entity_addr_t &addr)
   if (addr.type == entity_addr_t::TYPE_NONE) {
     return out << "-";
   }
-  out << entity_addr_t::get_type_name(addr.type) << ":"
-      << addr.get_sockaddr() << '/' << addr.nonce;
+  if (addr.type != entity_addr_t::TYPE_ANY) {
+    out << entity_addr_t::get_type_name(addr.type) << ":";
+  }
+  out << addr.get_sockaddr() << '/' << addr.nonce;
   return out;
 }