From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Thu, 28 Jul 2016 10:59:10 +0000 (+0200)
Subject: rgw: rename RGWStreamIOBase to RGWStreamIOEngine.
X-Git-Tag: v11.1.0~454^2~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18104f194e400c67a79378b380b70efc4a1a3a27;p=ceph.git

rgw: rename RGWStreamIOBase to RGWStreamIOEngine.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_client_io.cc b/src/rgw/rgw_client_io.cc
index 3aa518fd992..8d867765768 100644
--- a/src/rgw/rgw_client_io.cc
+++ b/src/rgw/rgw_client_io.cc
@@ -23,7 +23,7 @@ void RGWClientIO::init(CephContext *cct) {
 }
 
 
-int RGWStreamIOBase::print(const char *format, ...)
+int RGWStreamIOEngine::print(const char *format, ...)
 {
 #define LARGE_ENOUGH 128
   int size = LARGE_ENOUGH;
@@ -49,7 +49,7 @@ int RGWStreamIOBase::print(const char *format, ...)
   /* not reachable */
 }
 
-int RGWStreamIOBase::write(const char *buf, int len)
+int RGWStreamIOEngine::write(const char *buf, int len)
 {
   if (len == 0) {
     return 0;
@@ -66,7 +66,7 @@ int RGWStreamIOBase::write(const char *buf, int len)
   }
 }
 
-int RGWStreamIOBase::read(char *buf, int max, int *actual)
+int RGWStreamIOEngine::read(char *buf, int max, int *actual)
 {
   int ret = read_data(buf, max);
   if (ret < 0) {
@@ -80,7 +80,7 @@ int RGWStreamIOBase::read(char *buf, int max, int *actual)
 
 int RGWStreamIO::write(const char* const buf, const int len)
 {
-  const auto ret = RGWStreamIOBase::write(buf, len);
+  const auto ret = RGWStreamIOEngine::write(buf, len);
 
   if (ret >= 0 && account()) {
     bytes_sent += ret;
@@ -91,7 +91,7 @@ int RGWStreamIO::write(const char* const buf, const int len)
 
 int RGWStreamIO::read(char *buf, int max, int *actual)
 {
-  const auto ret = RGWStreamIOBase::read(buf, max, actual);
+  const auto ret = RGWStreamIOEngine::read(buf, max, actual);
   if (ret >= 0) {
     bytes_received += *actual;
   }
diff --git a/src/rgw/rgw_client_io.h b/src/rgw/rgw_client_io.h
index e3e5e929d22..1012ca0985b 100644
--- a/src/rgw/rgw_client_io.h
+++ b/src/rgw/rgw_client_io.h
@@ -34,7 +34,7 @@ public:
 }; /* RGWClient IO */
 
 
-class RGWStreamIOBase : public RGWClientIO {
+class RGWStreamIOEngine : public RGWClientIO {
   virtual int read_data(char *buf, int max) = 0;
   virtual int write_data(const char *buf, int len) = 0;
 public:
@@ -53,7 +53,7 @@ public:
 };
 
 /* HTTP IO: compatibility layer */
-class RGWStreamIO : public RGWStreamIOBase {
+class RGWStreamIO : public RGWStreamIOEngine {
   bool _account;
   size_t bytes_sent;
   size_t bytes_received;