librgw: s/rgw_rest_lib.{h,cc}/rgw_os_lib.{h,cc}

There is no longer an explicit (e.g., inherited) dependency on REST
implementations.

The remaining coupling (via RGWLibEnv, and struct req_state), can
be factored out later.

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

6 files changed, 9 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e2b02ee4d5..d7486bd596e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1158,6 +1158,7 @@ if(${WITH_RADOSGW})
     rgw/rgw_multi_del.cc
     rgw/rgw_object_expirer_core.cc
     rgw/rgw_op.cc
+    rgw/rgw_os_lib.cc
     rgw/rgw_policy_s3.cc
     rgw/rgw_process.cc
     rgw/rgw_quota.cc
@@ -1170,7 +1171,6 @@ if(${WITH_RADOSGW})
     rgw/rgw_rest_client.cc
     rgw/rgw_rest_config.cc
     rgw/rgw_rest_conn.cc
-    rgw/rgw_rest_lib.cc
     rgw/rgw_rest_log.cc
     rgw/rgw_rest_metadata.cc
     rgw/rgw_rest_opstate.cc
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 494483b2974..8a04cfa648e 100644
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -54,6 +54,7 @@ librgw_la_SOURCES =  \
 	rgw/rgw_frontend.cc \
 	rgw/rgw_object_expirer_core.cc \
 	rgw/rgw_website.cc
+	rgw/rgw_os_lib.cc
 
 librgw_la_CXXFLAGS = -Woverloaded-virtual ${AM_CXXFLAGS}
 noinst_LTLIBRARIES += librgw.la
@@ -105,7 +106,7 @@ radosgw_SOURCES = \
 	rgw/rgw_swift.cc \
 	rgw/rgw_swift_auth.cc \
 	rgw/rgw_loadgen.cc \
-	rgw/rgw_rest_lib.cc \
+	rgw/rgw_os_lib.cc \
 	rgw/rgw_main.cc
 radosgw_CFLAGS = -I$(srcdir)/civetweb/include
 radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 4c861c7a192..6905672619d 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -40,7 +40,7 @@
 #include "rgw_process.h"
 #include "rgw_rest_user.h"
 #include "rgw_rest_s3.h"
-#include "rgw_rest_lib.h"
+#include "rgw_os_lib.h"
 #include "rgw_auth_s3.h"
 #include "rgw_lib.h"
 
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 025d2ba420d..41878125d91 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -15,7 +15,7 @@
 #include "rgw_process.h"
 #include "rgw_rest_user.h"
 #include "rgw_rest_s3.h"
-#include "rgw_rest_lib.h"
+#include "rgw_os_lib.h"
 #include "rgw_auth_s3.h"
 #include "rgw_user.h"
 #include "rgw_bucket.h"
diff --git a/src/rgw/rgw_rest_lib.cc b/src/rgw/rgw_os_lib.cc
index 55078bcce9b..35b73281f11 100644
--- a/src/rgw/rgw_rest_lib.cc
+++ b/src/rgw/rgw_os_lib.cc
@@ -4,7 +4,7 @@
 #include "rgw_rest.h"
 #include "rgw_rest_s3.h"
 #include "rgw_rest_user.h"
-#include "rgw_rest_lib.h"
+#include "rgw_os_lib.h"
 #include "rgw_file.h"
 
 
diff --git a/src/rgw/rgw_rest_lib.h b/src/rgw/rgw_os_lib.h
index 6ea5e7278cf..639fc9951f3 100644
--- a/src/rgw/rgw_rest_lib.h
+++ b/src/rgw/rgw_os_lib.h
@@ -1,17 +1,13 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#ifndef CEPH_RGW_REST_LIB_H
-#define CEPH_RGW_REST_LIB_H
+#ifndef CEPH_RGW_OS_LIB_H
+#define CEPH_RGW_OS_LIB_H
 
 #include <functional>
-#include "rgw_rest.h"
 #include "rgw_common.h"
 #include "rgw_lib.h"
 
-#warning move to rgw_file...I think...there is no REST here
-
-
 /* RGWOps */
 
 class RGWListBuckets_ObjStore_Lib : public RGWListBuckets_ObjStore {
@@ -55,4 +51,4 @@ public:
 
 }; /* RGWListBucket_ObjStore_Lib */
 
-#endif /* CEPH_RGW_REST_LIB_H */
+#endif /* CEPH_RGW_OS_LIB_H */