From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 9 Aug 2013 16:31:28 +0000 (-0700)
Subject: rgw: rename data receive callbacks in swift token revocation
X-Git-Tag: v0.67~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1563613d83aa6937529fda8e09a0f59ff939712d;p=ceph.git

rgw: rename data receive callbacks in swift token revocation

Fixes: #5921
As part of the work that was made for dumpling, the http
client in-data callback was renamed in order to avoid confusion.
However, we missed the rename in a couple of places, which this
patch amend.

Reported-by: Roald van Loon <roaldvanloon@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc
index 9be9757e5f89a..dcf6230207b8b 100644
--- a/src/rgw/rgw_swift.cc
+++ b/src/rgw/rgw_swift.cc
@@ -291,7 +291,7 @@ class RGWValidateKeystoneToken : public RGWHTTPClient {
 public:
   RGWValidateKeystoneToken(CephContext *_cct, bufferlist *_bl) : RGWHTTPClient(_cct), bl(_bl) {}
 
-  int read_data(void *ptr, size_t len) {
+  int receive_data(void *ptr, size_t len) {
     bl->append((char *)ptr, len);
     return 0;
   }
@@ -304,7 +304,7 @@ class RGWGetRevokedTokens : public RGWHTTPClient {
 public:
   RGWGetRevokedTokens(CephContext *_cct, bufferlist *_bl) : RGWHTTPClient(_cct), bl(_bl) {}
 
-  int read_data(void *ptr, size_t len) {
+  int receive_data(void *ptr, size_t len) {
     bl->append((char *)ptr, len);
     return 0;
   }