From: Kefu Chai <kchai@redhat.com>
Date: Wed, 2 Jun 2021 04:04:30 +0000 (+0800)
Subject: auth/KeyRing: rename decode_plaintext() to decode()
X-Git-Tag: v17.1.0~1747^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41631%2Fhead;p=ceph.git

auth/KeyRing: rename decode_plaintext() to decode()

as the former is just an alias of the latter.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index d2e4cd391cf..cea1b3ecfea 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -162,7 +162,7 @@ void KeyRing::encode_formatted(string label, Formatter *f, bufferlist& bl)
   f->flush(bl);
 }
 
-void KeyRing::decode_plaintext(bufferlist::const_iterator& bli)
+void KeyRing::decode(bufferlist::const_iterator& bli)
 {
   int ret;
   bufferlist bl;
@@ -201,11 +201,6 @@ void KeyRing::decode_plaintext(bufferlist::const_iterator& bli)
   }
 }
 
-void KeyRing::decode(bufferlist::const_iterator& bl)
-{
-  decode_plaintext(bl);
-}
-
 int KeyRing::load(CephContext *cct, const std::string &filename)
 {
   if (filename.empty())
diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h
index 5524cb79282..ed15af4ecce 100644
--- a/src/auth/KeyRing.h
+++ b/src/auth/KeyRing.h
@@ -91,7 +91,7 @@ public:
   }
   void import(CephContext *cct, KeyRing& other);
 
-  // encoders
+  // decode as plaintext
   void decode(ceph::buffer::list::const_iterator& bl);
 
   void encode_plaintext(ceph::buffer::list& bl);
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d66908f417d..9ab48e010f6 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6028,7 +6028,7 @@ int Monitor::mkfs(bufferlist& osdmapbl)
 	bl.append(keyring_plaintext);
 	try {
 	  auto i = bl.cbegin();
-	  keyring.decode_plaintext(i);
+	  keyring.decode(i);
 	}
 	catch (const ceph::buffer::error& e) {
 	  derr << "error decoding keyring " << keyring_plaintext