update ceph source to reef 18.1.2

[ceph.git] / ceph / src / test / librgw_file.cc

diff --git a/ceph/src/test/librgw_file.cc b/ceph/src/test/librgw_file.cc
index 9dc9541acaa03765d6cf69f51aec520522903181..8f50ab7ac192a5fe95eb437e174a4a2e9664dcac 100644 (file)
--- a/ceph/src/test/librgw_file.cc
+++ b/ceph/src/test/librgw_file.cc
@@ -29,7 +29,7 @@
 using namespace std;
 
 namespace {
-  librgw_t rgw = nullptr;
+  librgw_t h_rgw = nullptr;
   string uid("testuser");
   string access_key("");
   string secret_key("");
@@ -49,13 +49,13 @@ namespace {
 }
 
 TEST(LibRGW, INIT) {
-  int ret = librgw_create(&rgw, saved_args.argc, saved_args.argv);
+  int ret = librgw_create(&h_rgw, saved_args.argc, saved_args.argv);
   ASSERT_EQ(ret, 0);
-  ASSERT_NE(rgw, nullptr);
+  ASSERT_NE(h_rgw, nullptr);
 }
 
 TEST(LibRGW, MOUNT) {
-  int ret = rgw_mount2(rgw, uid.c_str(), access_key.c_str(), secret_key.c_str(),
+  int ret = rgw_mount2(h_rgw, uid.c_str(), access_key.c_str(), secret_key.c_str(),
                        "/", &fs, RGW_MOUNT_FLAG_NONE);
   ASSERT_EQ(ret, 0);
   ASSERT_NE(fs, nullptr);
@@ -73,7 +73,7 @@ TEST(LibRGW, GETATTR_ROOT) {
 }
 
 extern "C" {
-  static bool r1_cb(const char* name, void *arg, uint64_t offset,
+  static int r1_cb(const char* name, void *arg, uint64_t offset,
                    struct stat* st, uint32_t st_mask,
                    uint32_t flags) {
     // don't need arg--it would point to fids1
@@ -137,7 +137,7 @@ TEST(LibRGW, GETATTR_BUCKETS) {
 }
 
 extern "C" {
-  static bool r2_cb(const char* name, void *arg, uint64_t offset,
+  static int r2_cb(const char* name, void *arg, uint64_t offset,
                    struct stat* st, uint32_t st_mask,
                    uint32_t flags) {
     std::vector<fid_type>& obj_vector = *(static_cast<std::vector<fid_type>*>(arg));
@@ -173,7 +173,9 @@ TEST(LibRGW, LIST_OBJECTS) {
   }
 }
 
-extern bool global_stop;
+namespace rgw {
+  extern bool global_stop;
+}
 
 TEST(LibRGW, GETATTR_OBJECTS) {
   if (do_getattr) {
@@ -181,7 +183,7 @@ TEST(LibRGW, GETATTR_OBJECTS) {
     struct stat st;
     int ret;
 
-    global_stop = true;
+    rgw::global_stop = true;
 
     for (auto& fid_row : bucket_matrix) {
       auto& fid = get<0>(fid_row); // bucket
@@ -237,7 +239,7 @@ TEST(LibRGW, UMOUNT) {
 }
 
 TEST(LibRGW, SHUTDOWN) {
-  librgw_shutdown(rgw);
+  librgw_shutdown(h_rgw);
 }
 
 int main(int argc, char *argv[])