From: N Balachandran Date: Wed, 3 Apr 2024 15:15:35 +0000 (+0530) Subject: rbd-mirror: code cleanup X-Git-Tag: v20.0.0~2191^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cc08bf94da9fd1db11c9c6f4e80b6b0c7146938;p=ceph.git rbd-mirror: code cleanup Renamed ostream argument in overloaded operator implementations. Signed-off-by: N Balachandran --- diff --git a/src/tools/rbd_mirror/Types.cc b/src/tools/rbd_mirror/Types.cc index cd71c73b1cc6..21186bae278a 100644 --- a/src/tools/rbd_mirror/Types.cc +++ b/src/tools/rbd_mirror/Types.cc @@ -11,19 +11,19 @@ std::ostream &operator<<(std::ostream &os, const ImageId &image_id) { << "id=" << image_id.id; } -std::ostream& operator<<(std::ostream& lhs, - const LocalPoolMeta& rhs) { - return lhs << "mirror_uuid=" << rhs.mirror_uuid; +std::ostream& operator<<(std::ostream& os, + const LocalPoolMeta& local_pool_meta) { + return os << "mirror_uuid=" << local_pool_meta.mirror_uuid; } -std::ostream& operator<<(std::ostream& lhs, - const RemotePoolMeta& rhs) { - return lhs << "mirror_uuid=" << rhs.mirror_uuid << ", " - "mirror_peer_uuid=" << rhs.mirror_peer_uuid; +std::ostream& operator<<(std::ostream& os, + const RemotePoolMeta& remote_pool_meta) { + return os << "mirror_uuid=" << remote_pool_meta.mirror_uuid << ", " + "mirror_peer_uuid=" << remote_pool_meta.mirror_peer_uuid; } -std::ostream& operator<<(std::ostream& lhs, const PeerSpec &peer) { - return lhs << "uuid: " << peer.uuid +std::ostream& operator<<(std::ostream& os, const PeerSpec &peer) { + return os << "uuid: " << peer.uuid << " cluster: " << peer.cluster_name << " client: " << peer.client_name; } diff --git a/src/tools/rbd_mirror/Types.h b/src/tools/rbd_mirror/Types.h index 9bba58fb130c..dee7ab3ebc41 100644 --- a/src/tools/rbd_mirror/Types.h +++ b/src/tools/rbd_mirror/Types.h @@ -72,7 +72,7 @@ struct LocalPoolMeta { std::string mirror_uuid; }; -std::ostream& operator<<(std::ostream& lhs, +std::ostream& operator<<(std::ostream& os, const LocalPoolMeta& local_pool_meta); struct RemotePoolMeta { @@ -87,7 +87,7 @@ struct RemotePoolMeta { std::string mirror_peer_uuid; }; -std::ostream& operator<<(std::ostream& lhs, +std::ostream& operator<<(std::ostream& os, const RemotePoolMeta& remote_pool_meta); template @@ -114,8 +114,8 @@ struct Peer { }; template -std::ostream& operator<<(std::ostream& lhs, const Peer& peer) { - return lhs << peer.remote_pool_meta; +std::ostream& operator<<(std::ostream& os, const Peer& peer) { + return os << peer.remote_pool_meta; } struct PeerSpec { @@ -162,7 +162,7 @@ struct PeerSpec { } }; -std::ostream& operator<<(std::ostream& lhs, const PeerSpec &peer); +std::ostream& operator<<(std::ostream& os, const PeerSpec &peer); } // namespace mirror } // namespace rbd