Revert "tools/ceph-dencoder: Add an option stray_okay"

This reverts commit d4a93ce43ad26ddcbff1c66c8c1f725aefcb84a0.

Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc
index 4db6d9b534e933df787de40aa247e5d7a7657d89..0bc8c8ae57929e640072ec4023ec7ae4a024365d 100644 (file)
--- a/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -275,12 +275,6 @@ int main(int argc, const char **argv)
        return 0;
       else
        return 1;
-    } else if (*i == string("stray_okay")) {
-      if (!den) {
-       cerr << "must first select type with 'type <name>'" << std::endl;
-       return 1;
-      }
-      den->set_stray_okay();
     } else {
       cerr << "unknown option '" << *i << "'" << std::endl;
       return 1;

diff --git a/src/tools/ceph-dencoder/denc_registry.h b/src/tools/ceph-dencoder/denc_registry.h
index de4a2201eb3d8b3894ffdd52de1db86ca9875f7a..6b152a4b23492cfb56fb006baf20267ce947b2a9 100644 (file)
--- a/src/tools/ceph-dencoder/denc_registry.h
+++ b/src/tools/ceph-dencoder/denc_registry.h
@@ -30,7 +30,6 @@ struct Dencoder {
   virtual int num_generated() = 0;
   virtual std::string select_generated(unsigned n) = 0;
   virtual bool is_deterministic() = 0;
-  virtual void set_stray_okay() = 0;
   unsigned get_struct_v(bufferlist bl, uint64_t seek) const {
     auto p = bl.cbegin(seek);
     uint8_t struct_v = 0;
@@ -109,10 +108,6 @@ public:
   bool is_deterministic() override {
     return !nondeterministic;
   }
-
-  void set_stray_okay() {
-    stray_okay = true;
-  }
 };
 
 template<class T>
@@ -241,8 +236,6 @@ public:
   bool is_deterministic() override {
     return true;
   }
-  void set_stray_okay() override {
-  }
 
   //void print(ostream& out) {
   //out << m_object << std::endl;