librgw: header inclusion fix, actually call callbacks

Fix public header inclusion from rgw_file.h internal header, which
of course needs to see the public interface.

Finish up the minimal RGWListBucketsRequest callback functor.

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

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 7cc0ee4414c96562d2687a1d7343e0915d3561d9..8f1c7edc6709fe19698bb47bbf0148b2444b2428 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -4,6 +4,8 @@
 #ifndef RGW_FILE_H
 #define RGW_FILE_H
 
+#include "include/rados/rgw_file.h"
+
 /* internal header */
 
 /*

diff --git a/src/rgw/rgw_rest_lib.cc b/src/rgw/rgw_rest_lib.cc
index 410bf85bc62cf7a986215148c5cead69378db9bc..ccfc8616fd370385af6b354e178447f19bf73fbc 100644 (file)
--- a/src/rgw/rgw_rest_lib.cc
+++ b/src/rgw/rgw_rest_lib.cc
@@ -5,6 +5,7 @@
 #include "rgw_rest_s3.h"
 #include "rgw_rest_user.h"
 #include "rgw_rest_lib.h"
+#include "rgw_file.h"
 
 /* XXX going away ! */
 
@@ -67,11 +68,15 @@ void RGWListBuckets_ObjStore_Lib::send_response_data(RGWUserBuckets& buckets)
   if (!sent_data)
     return;
 
+  RGWListBucketsRequest* req
+    = reinterpret_cast<RGWListBucketsRequest*>(this);
+
   map<string, RGWBucketEnt>& m = buckets.get_buckets();
   for (const auto& iter : m) {
-    const RGWBucketEnt& ent = iter.second;
     const std::string& marker = iter.first; // XXX may need later
-    // XXXX (void) cb(ent.bucket.name, marker); // XXX attributes
+    const RGWBucketEnt& ent = iter.second;
+    /* call me maybe */
+    req->operator()(ent.bucket.name, marker); // XXX attributes
   }
 } /* send_response_data */