librgw: rename RGWHandler_REST_Lib (sic), inherit from RGWHandler

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_rest_lib.cc b/src/rgw/rgw_rest_lib.cc
index d0edb1b9ff7556e5d9fa67018f2e0a667bb468d7..edcd6b5208007e377a1a5d0a87eeceb367ede5fa 100644 (file)
--- a/src/rgw/rgw_rest_lib.cc
+++ b/src/rgw/rgw_rest_lib.cc
@@ -10,7 +10,7 @@
 /* XXX going away ! */
 
 /* static */
-int RGWHandler_REST_Lib::init_from_header(struct req_state *s)
+int RGWHandler_Lib::init_from_header(struct req_state *s)
 {
   string req;
   string first;

diff --git a/src/rgw/rgw_rest_lib.h b/src/rgw/rgw_rest_lib.h
index 34cbd2ae90deadd7af24e6238b8a0614a50d1646..f810380544b2fdf9718aceadf4966ca8fda185c6 100644 (file)
--- a/src/rgw/rgw_rest_lib.h
+++ b/src/rgw/rgw_rest_lib.h
@@ -10,19 +10,15 @@
 #include "rgw_lib.h"
 
 
-/* XXX do we even need an RGWRESTMgr? */
+/* XXX */
 class RGWRESTMgr_Lib : public RGWRESTMgr {
 public:
   RGWRESTMgr_Lib() {}
   virtual ~RGWRESTMgr_Lib() {}
- #warning remove this
-#if 0
-  virtual RGWHandler* get_handler(struct req_state* s) { return nullptr; }
-#endif
 }; /* RGWRESTMgr_Lib */
 
-/* rgw_lib RGWHandler */
-class RGWHandler_REST_Lib : public RGWHandler_REST {
+/* XXX */
+class RGWHandler_Lib : public RGWHandler {
   friend class RGWRESTMgr_Lib;
 public:
 
@@ -30,10 +26,10 @@ public:
     return RGW_Auth_S3::authorize(store, s);
   }
 
-  RGWHandler_REST_Lib() {}
-  virtual ~RGWHandler_REST_Lib() {}
+  RGWHandler_Lib() {}
+  virtual ~RGWHandler_Lib() {}
   static int init_from_header(struct req_state *s);
-}; /* RGWHandler_REST_Lib */
+}; /* RGWHandler_Lib */
 
 
 /* RGWOps */