summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-08-09 10:29:17 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-08-09 12:33:54 -0700
commit9029555f58eed34628fad88f24523b4c554750c9 (patch)
tree36e249436cd99b20218d0c0ba194437b15e054c0
parent71177fe3c7a164ad4b0c7d507949b2f07a792f9a (diff)
downloadceph-9029555f58eed34628fad88f24523b4c554750c9.tar.gz
rgw: make RGWHTTPClient callback methods pure virtual
This will make it easier to catch interface changes, like the ones that triggered #5921. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/rgw/rgw_http_client.h6
-rw-r--r--src/rgw/rgw_swift.cc19
2 files changed, 22 insertions, 3 deletions
diff --git a/src/rgw/rgw_http_client.h b/src/rgw/rgw_http_client.h
index cc69383b62d..3c0040424a4 100644
--- a/src/rgw/rgw_http_client.h
+++ b/src/rgw/rgw_http_client.h
@@ -21,9 +21,9 @@ public:
headers.push_back(pair<string, string>(name, val));
}
- virtual int receive_header(void *ptr, size_t len) { return 0; }
- virtual int receive_data(void *ptr, size_t len) { return 0; }
- virtual int send_data(void *ptr, size_t len) { return 0; }
+ virtual int receive_header(void *ptr, size_t len) = 0;
+ virtual int receive_data(void *ptr, size_t len) = 0;
+ virtual int send_data(void *ptr, size_t len) = 0;
void set_send_length(size_t len) {
send_len = len;
diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc
index 8ad59e22485..b62033b2764 100644
--- a/src/rgw/rgw_swift.cc
+++ b/src/rgw/rgw_swift.cc
@@ -29,6 +29,12 @@ public:
RGWValidateSwiftToken(CephContext *_cct, struct rgw_swift_auth_info *_info) : RGWHTTPClient(_cct), info(_info) {}
int receive_header(void *ptr, size_t len);
+ int receive_data(void *ptr, size_t len) {
+ return 0;
+ }
+ int send_data(void *ptr, size_t len) {
+ return 0;
+ }
friend class RGWKeystoneTokenCache;
};
@@ -295,6 +301,13 @@ public:
bl->append((char *)ptr, len);
return 0;
}
+ int receive_header(void *ptr, size_t len) {
+ return 0;
+ }
+ int send_data(void *ptr, size_t len) {
+ return 0;
+ }
+
};
static RGWKeystoneTokenCache *keystone_token_cache = NULL;
@@ -308,6 +321,12 @@ public:
bl->append((char *)ptr, len);
return 0;
}
+ int receive_header(void *ptr, size_t len) {
+ return 0;
+ }
+ int send_data(void *ptr, size_t len) {
+ return 0;
+ }
};
static int open_cms_envelope(CephContext *cct, string& src, string& dst)