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 d2e4cd391cf9e63893725fdbf41a2b5a2158bcc2..cea1b3ecfeaf41d3d4f888470fc2a5c9e3d56557 100644 (file)
--- 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 5524cb7928284d69b9e7726237dca36a951161a0..ed15af4eccec3f85d23f2087bdfd5c1210ccf575 100644 (file)
--- 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 d66908f417dcaaea8ca8f45dfc360f3bfee42161..9ab48e010f6f4c3d8d9388b137a0a5c6bcd6fdd6 100644 (file)
--- 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