rgw: rename dump_value_str to dump_format

rename dump_value_str to dump_format for compatibility with Formatter.cc

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index b319ac806cddf46ad779ea5bfaab269d81c0a581..ebef4c891f13c11138625b16c74dd9c631cd1dfe 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -862,25 +862,25 @@ int main(int argc, char **argv)
              << "\"" << escape_str(entry.referrer, '"') << "\"" << std::endl;
       } else {
         formatter->open_object_section("LogEntry");
-        formatter->dump_value_str("Bucket", "%s", entry.bucket.c_str());
+        formatter->dump_format("Bucket", "%s", entry.bucket.c_str());
 
         stringstream ss;
         ss << entry.time;
         string s = ss.str();
 
-        formatter->dump_value_str("Time", "%s", s.c_str());
-        formatter->dump_value_str("RemoteAddr", "%s", entry.remote_addr.c_str());
-        formatter->dump_value_str("User", "%s", entry.user.c_str());
-        formatter->dump_value_str("Operation", "%s", entry.op.c_str());
-        formatter->dump_value_str("URI", "%s", entry.uri.c_str());
-        formatter->dump_value_str("HttpStatus", "%s", entry.http_status.c_str());
-        formatter->dump_value_str("ErrorCode", "%s", entry.error_code.c_str());
-        formatter->dump_value_str("BytesSent", "%lld", entry.bytes_sent);
-        formatter->dump_value_str("BytesReceived", "%lld", entry.bytes_received);
-        formatter->dump_value_str("ObjectSize", "%lld", entry.obj_size);
-        formatter->dump_value_str("TotalTime", "%lld", total_time);
-        formatter->dump_value_str("UserAgent", "%s",  entry.user_agent.c_str());
-        formatter->dump_value_str("Referrer", "%s",  entry.referrer.c_str());
+        formatter->dump_format("Time", "%s", s.c_str());
+        formatter->dump_format("RemoteAddr", "%s", entry.remote_addr.c_str());
+        formatter->dump_format("User", "%s", entry.user.c_str());
+        formatter->dump_format("Operation", "%s", entry.op.c_str());
+        formatter->dump_format("URI", "%s", entry.uri.c_str());
+        formatter->dump_format("HttpStatus", "%s", entry.http_status.c_str());
+        formatter->dump_format("ErrorCode", "%s", entry.error_code.c_str());
+        formatter->dump_format("BytesSent", "%lld", entry.bytes_sent);
+        formatter->dump_format("BytesReceived", "%lld", entry.bytes_received);
+        formatter->dump_format("ObjectSize", "%lld", entry.obj_size);
+        formatter->dump_format("TotalTime", "%lld", total_time);
+        formatter->dump_format("UserAgent", "%s",  entry.user_agent.c_str());
+        formatter->dump_format("Referrer", "%s",  entry.referrer.c_str());
         formatter->close_section("LogEntry");
         formatter->flush(cout);
       }
@@ -907,8 +907,8 @@ int main(int argc, char **argv)
     formatter->init();
     formatter->open_object_section("Pool");
     formatter->dump_value_int("ID", "%d", pool_id);
-    formatter->dump_value_str("Bucket", "%s", info.bucket.c_str());
-    formatter->dump_value_str("Owner", "%s", info.owner.c_str());
+    formatter->dump_format("Bucket", "%s", info.bucket.c_str());
+    formatter->dump_format("Owner", "%s", info.owner.c_str());
     formatter->close_section("Pool");
     formatter->flush(cout);
   }

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index a570c2b30f9da7b6b6e1eaaf66179676fe4ab6ab..dee1a17d2d2772282835634ae2e71a90bd87a327 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -381,7 +381,7 @@ public:
   virtual void open_object_section(const char *name) = 0;
   virtual void close_section(const char *name) = 0;
   virtual void dump_value_int(const char *name, const char *fmt, ...) = 0;
-  virtual void dump_value_str(const char *name, const char *fmt, ...) = 0;
+  virtual void dump_format(const char *name, const char *fmt, ...) = 0;
 };
 
 struct RGWEnv;

diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
index 775af09a407bfee5959a27d271ff6ccc2d534c1c..6644de5176703e324cfcbea906093a0d01753972 100644 (file)
--- a/src/rgw/rgw_formats.cc
+++ b/src/rgw/rgw_formats.cc
@@ -66,7 +66,7 @@ void RGWFormatter_Plain::dump_value_int(const char *name, const char *fmt, ...)
   write_data("%s\n", buf);
 }
 
-void RGWFormatter_Plain::dump_value_str(const char *name, const char *fmt, ...)
+void RGWFormatter_Plain::dump_format(const char *name, const char *fmt, ...)
 {
   char buf[LARGE_SIZE];
   va_list ap;
@@ -119,7 +119,7 @@ void RGWFormatter_XML::dump_value_int(const char *name, const char *fmt, ...)
   write_data("<%s>%s</%s>", name, buf, name);
 }
 
-void RGWFormatter_XML::dump_value_str(const char *name, const char *fmt, ...)
+void RGWFormatter_XML::dump_format(const char *name, const char *fmt, ...)
 {
   char buf[LARGE_SIZE];
   va_list ap;
@@ -189,7 +189,7 @@ void RGWFormatter_JSON::dump_value_int(const char *name, const char *fmt, ...)
   entry.size++;
 }
 
-void RGWFormatter_JSON::dump_value_str(const char *name, const char *fmt, ...)
+void RGWFormatter_JSON::dump_format(const char *name, const char *fmt, ...)
 {
   char buf[LARGE_SIZE];
   va_list ap;

diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h
index f9bc58f9e4fa3c427a71d044c60878b55f718eba..ee7751a06c4e9b37ec022d637b7bca42df3bdf8e 100644 (file)
--- a/src/rgw/rgw_formats.h
+++ b/src/rgw/rgw_formats.h
@@ -20,7 +20,7 @@ public:
   void open_object_section(const char *name);
   void close_section(const char *name);
   void dump_value_int(const char *name, const char *fmt, ...);
-  void dump_value_str(const char *name, const char *fmt, ...);
+  void dump_format(const char *name, const char *fmt, ...);
 };
 
 class RGWFormatter_XML : public RGWFormatter {
@@ -43,7 +43,7 @@ public:
   }
   void close_section(const char *name);
   void dump_value_int(const char *name, const char *fmt, ...);
-  void dump_value_str(const char *name, const char *fmt, ...);
+  void dump_format(const char *name, const char *fmt, ...);
 };
 
 struct json_stack_entry {
@@ -66,7 +66,7 @@ public:
   void open_object_section(const char *name);
   void close_section(const char *name);
   void dump_value_int(const char *name, const char *fmt, ...);
-  void dump_value_str(const char *name, const char *fmt, ...);
+  void dump_format(const char *name, const char *fmt, ...);
 };
 
 #endif

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index fbb2c98e6f77e094cea333fc6b1e4a7916608116..ecc2a7ecbd45d263b0c8f0df767738f126be2356 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -129,7 +129,7 @@ void dump_time(struct req_state *s, const char *name, time_t *t)
   if (strftime(buf, sizeof(buf), "%Y-%m-%dT%T.000Z", tmp) == 0)
     return;
 
-  s->formatter->dump_value_str(name, buf); 
+  s->formatter->dump_format(name, buf); 
 }
 
 void dump_owner(struct req_state *s, string& id, string& name, const char *section)
@@ -137,8 +137,8 @@ void dump_owner(struct req_state *s, string& id, string& name, const char *secti
   if (!section)
     section = "Owner";
   s->formatter->open_object_section(section);
-  s->formatter->dump_value_str("ID", id.c_str());
-  s->formatter->dump_value_str("DisplayName", name.c_str());
+  s->formatter->dump_format("ID", id.c_str());
+  s->formatter->dump_format("DisplayName", name.c_str());
   s->formatter->close_section(section);
 }
 
@@ -172,7 +172,7 @@ void end_header(struct req_state *s, const char *content_type)
     if (!s->err.s3_code.empty())
       s->formatter->dump_value_int("Code", "%s", s->err.s3_code.c_str());
     if (!s->err.message.empty())
-      s->formatter->dump_value_str("Message", s->err.message.c_str());
+      s->formatter->dump_format("Message", s->err.message.c_str());
     s->formatter->close_section("Error");
     dump_content_length(s, s->formatter->get_len());
   }

diff --git a/src/rgw/rgw_rest_os.cc b/src/rgw/rgw_rest_os.cc
index e630dac80afa87bc9fd6391b7922ea9d9b2de00e..44d1f5aeb67af586fca6c5203426843528655e93 100644 (file)
--- a/src/rgw/rgw_rest_os.cc
+++ b/src/rgw/rgw_rest_os.cc
@@ -35,7 +35,7 @@ void RGWListBuckets_REST_OS::send_response()
   for (int i = 0; i < limit && iter != m.end(); ++iter, ++i) {
     RGWBucketEnt obj = iter->second;
     s->formatter->open_object_section("container");
-    s->formatter->dump_value_str("name", obj.name.c_str());
+    s->formatter->dump_format("name", obj.name.c_str());
     s->formatter->dump_value_int("count", "%lld", obj.count);
     s->formatter->dump_value_int("bytes", "%lld", obj.size);
     s->formatter->close_section("container");
@@ -82,18 +82,18 @@ void RGWListBucket_REST_OS::send_response()
 
     if (do_objs && (marker.empty() || iter->name.compare(marker) > 0)) {
       s->formatter->open_object_section("object");
-      s->formatter->dump_value_str("name", iter->name.c_str());
-      s->formatter->dump_value_str("hash", "\"%s\"", iter->etag);
+      s->formatter->dump_format("name", iter->name.c_str());
+      s->formatter->dump_format("hash", "\"%s\"", iter->etag);
       s->formatter->dump_value_int("bytes", "%lld", iter->size);
       if (iter->content_type.size())
-        s->formatter->dump_value_str("content_type", iter->content_type.c_str());
+        s->formatter->dump_format("content_type", iter->content_type.c_str());
       dump_time(s, "last_modified", &iter->mtime);
       s->formatter->close_section("object");
     }
 
     if (do_pref &&  (marker.empty() || pref_iter->first.compare(marker) > 0)) {
       s->formatter->open_object_section("object");
-      s->formatter->dump_value_str("name", pref_iter->first.c_str());
+      s->formatter->dump_format("name", pref_iter->first.c_str());
       s->formatter->close_section("object");
     }
     if (do_objs)

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index b564b5d78cb4631cf18ebfda9e93bbb46ea4eb5e..e52e85c8f685f00bfbbbb6653518c3233f2668e0 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -25,7 +25,7 @@ void list_all_buckets_end(struct req_state *s)
 void dump_bucket(struct req_state *s, RGWBucketEnt& obj)
 {
   s->formatter->open_object_section("Bucket");
-  s->formatter->dump_value_str("Name", obj.name.c_str());
+  s->formatter->dump_format("Name", obj.name.c_str());
   dump_time(s, "CreationDate", &obj.mtime);
   s->formatter->close_section("Bucket");
 }
@@ -124,28 +124,28 @@ void RGWListBucket_REST_S3::send_response()
     return;
 
   s->formatter->open_object_section("ListBucketResult");
-  s->formatter->dump_value_str("Name", s->bucket);
+  s->formatter->dump_format("Name", s->bucket);
   if (!prefix.empty())
-    s->formatter->dump_value_str("Prefix", prefix.c_str());
+    s->formatter->dump_format("Prefix", prefix.c_str());
   if (!marker.empty())
-    s->formatter->dump_value_str("Marker", marker.c_str());
+    s->formatter->dump_format("Marker", marker.c_str());
   if (!max_keys.empty()) {
-    s->formatter->dump_value_str("MaxKeys", max_keys.c_str());
+    s->formatter->dump_format("MaxKeys", max_keys.c_str());
   }
   if (!delimiter.empty())
-    s->formatter->dump_value_str("Delimiter", delimiter.c_str());
+    s->formatter->dump_format("Delimiter", delimiter.c_str());
 
-  s->formatter->dump_value_str("IsTruncated", (is_truncated ? "true" : "false"));
+  s->formatter->dump_format("IsTruncated", (is_truncated ? "true" : "false"));
 
   if (ret >= 0) {
     vector<RGWObjEnt>::iterator iter;
     for (iter = objs.begin(); iter != objs.end(); ++iter) {
       s->formatter->open_array_section("Contents");
-      s->formatter->dump_value_str("Key", iter->name.c_str());
+      s->formatter->dump_format("Key", iter->name.c_str());
       dump_time(s, "LastModified", &iter->mtime);
-      s->formatter->dump_value_str("ETag", "\"%s\"", iter->etag);
+      s->formatter->dump_format("ETag", "\"%s\"", iter->etag);
       s->formatter->dump_value_int("Size", "%lld", iter->size);
-      s->formatter->dump_value_str("StorageClass", "STANDARD");
+      s->formatter->dump_format("StorageClass", "STANDARD");
       dump_owner(s, iter->owner, iter->owner_display_name);
       s->formatter->close_section("Contents");
     }
@@ -153,7 +153,7 @@ void RGWListBucket_REST_S3::send_response()
       s->formatter->open_array_section("CommonPrefixes");
       map<string, bool>::iterator pref_iter;
       for (pref_iter = common_prefixes.begin(); pref_iter != common_prefixes.end(); ++pref_iter) {
-        s->formatter->dump_value_str("Prefix", pref_iter->first.c_str());
+        s->formatter->dump_format("Prefix", pref_iter->first.c_str());
       }
       s->formatter->close_section("CommonPrefixes");
     }
@@ -219,7 +219,7 @@ void RGWCopyObj_REST_S3::send_response()
       bufferlist& bl = iter->second;
       if (bl.length()) {
         char *etag = bl.c_str();
-        s->formatter->dump_value_str("ETag", etag);
+        s->formatter->dump_format("ETag", etag);
       }
     }
     s->formatter->close_section("CopyObjectResult");
@@ -255,9 +255,9 @@ void RGWInitMultipart_REST_S3::send_response()
   if (ret == 0) { 
     dump_start(s);
     s->formatter->open_object_section("InitiateMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"");
-    s->formatter->dump_value_str("Bucket", s->bucket);
-    s->formatter->dump_value_str("Key", s->object);
-    s->formatter->dump_value_str("UploadId", upload_id.c_str());
+    s->formatter->dump_format("Bucket", s->bucket);
+    s->formatter->dump_format("Key", s->object);
+    s->formatter->dump_format("UploadId", upload_id.c_str());
     s->formatter->close_section("InitiateMultipartUploadResult");
     s->formatter->flush(s);
   }
@@ -274,10 +274,10 @@ void RGWCompleteMultipart_REST_S3::send_response()
     s->formatter->open_object_section("CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"");
     const char *gateway_dns_name = s->env->get("RGW_DNS_NAME");
     if (gateway_dns_name)
-      s->formatter->dump_value_str("Location", "%s.%s", s->bucket, gateway_dns_name);
-    s->formatter->dump_value_str("Bucket", s->bucket);
-    s->formatter->dump_value_str("Key", s->object);
-    s->formatter->dump_value_str("ETag", etag.c_str());
+      s->formatter->dump_format("Location", "%s.%s", s->bucket, gateway_dns_name);
+    s->formatter->dump_format("Bucket", s->bucket);
+    s->formatter->dump_format("Key", s->object);
+    s->formatter->dump_format("ETag", etag.c_str());
     s->formatter->close_section("CompleteMultipartUploadResult");
     s->formatter->flush(s);
   }
@@ -311,14 +311,14 @@ void RGWListMultipart_REST_S3::send_response()
     for (i = 0, test_iter = iter; test_iter != parts.end() && i < max_parts; ++test_iter, ++i) {
       cur_max = test_iter->first;
     }
-    s->formatter->dump_value_str("Bucket", s->bucket);
-    s->formatter->dump_value_str("Key", s->object);
-    s->formatter->dump_value_str("UploadId", upload_id.c_str());
-    s->formatter->dump_value_str("StorageClass", "STANDARD");
-    s->formatter->dump_value_str("PartNumberMarker", "%d", marker);
-    s->formatter->dump_value_str("NextPartNumberMarker", "%d", cur_max + 1);
-    s->formatter->dump_value_str("MaxParts", "%d", max_parts);
-    s->formatter->dump_value_str("IsTruncated", "%s", (test_iter == parts.end() ? "false" : "true"));
+    s->formatter->dump_format("Bucket", s->bucket);
+    s->formatter->dump_format("Key", s->object);
+    s->formatter->dump_format("UploadId", upload_id.c_str());
+    s->formatter->dump_format("StorageClass", "STANDARD");
+    s->formatter->dump_format("PartNumberMarker", "%d", marker);
+    s->formatter->dump_format("NextPartNumberMarker", "%d", cur_max + 1);
+    s->formatter->dump_format("MaxParts", "%d", max_parts);
+    s->formatter->dump_format("IsTruncated", "%s", (test_iter == parts.end() ? "false" : "true"));
 
     ACLOwner& owner = policy.get_owner();
     dump_owner(s, owner.get_id(), owner.get_display_name());
@@ -331,12 +331,12 @@ void RGWListMultipart_REST_S3::send_response()
       localtime_r(&sec, &tmp);
       char buf[TIME_BUF_SIZE];
       if (strftime(buf, sizeof(buf), "%Y-%m-%dT%T.000Z", &tmp) > 0) {
-        s->formatter->dump_value_str("LastModified", buf);
+        s->formatter->dump_format("LastModified", buf);
       }
 
       s->formatter->open_object_section("Part");
       s->formatter->dump_value_int("PartNumber", "%u", info.num);
-      s->formatter->dump_value_str("ETag", "%s", info.etag.c_str());
+      s->formatter->dump_format("ETag", "%s", info.etag.c_str());
       s->formatter->dump_value_int("Size", "%llu", info.size);
       s->formatter->close_section("Part");
     }
@@ -357,36 +357,36 @@ void RGWListBucketMultiparts_REST_S3::send_response()
     return;
 
   s->formatter->open_object_section("ListMultipartUploadsResult");
-  s->formatter->dump_value_str("Bucket", s->bucket);
+  s->formatter->dump_format("Bucket", s->bucket);
   if (!prefix.empty())
-    s->formatter->dump_value_str("ListMultipartUploadsResult.Prefix", prefix.c_str());
+    s->formatter->dump_format("ListMultipartUploadsResult.Prefix", prefix.c_str());
   string& key_marker = marker.get_key();
   if (!key_marker.empty())
-    s->formatter->dump_value_str("KeyMarker", key_marker.c_str());
+    s->formatter->dump_format("KeyMarker", key_marker.c_str());
   string& upload_id_marker = marker.get_upload_id();
   if (!upload_id_marker.empty())
-    s->formatter->dump_value_str("UploadIdMarker", upload_id_marker.c_str());
+    s->formatter->dump_format("UploadIdMarker", upload_id_marker.c_str());
   string next_key = next_marker.mp.get_key();
   if (!next_key.empty())
-    s->formatter->dump_value_str("NextKeyMarker", next_key.c_str());
+    s->formatter->dump_format("NextKeyMarker", next_key.c_str());
   string next_upload_id = next_marker.mp.get_upload_id();
   if (!next_upload_id.empty())
-    s->formatter->dump_value_str("NextUploadIdMarker", next_upload_id.c_str());
-  s->formatter->dump_value_str("MaxUploads", "%d", max_uploads);
+    s->formatter->dump_format("NextUploadIdMarker", next_upload_id.c_str());
+  s->formatter->dump_format("MaxUploads", "%d", max_uploads);
   if (!delimiter.empty())
-    s->formatter->dump_value_str("Delimiter", delimiter.c_str());
-  s->formatter->dump_value_str("IsTruncated", (is_truncated ? "true" : "false"));
+    s->formatter->dump_format("Delimiter", delimiter.c_str());
+  s->formatter->dump_format("IsTruncated", (is_truncated ? "true" : "false"));
 
   if (ret >= 0) {
     vector<RGWMultipartUploadEntry>::iterator iter;
     for (iter = uploads.begin(); iter != uploads.end(); ++iter) {
       RGWMPObj& mp = iter->mp;
       s->formatter->open_array_section("Upload");
-      s->formatter->dump_value_str("Key", mp.get_key().c_str());
-      s->formatter->dump_value_str("UploadId", mp.get_upload_id().c_str());
+      s->formatter->dump_format("Key", mp.get_key().c_str());
+      s->formatter->dump_format("UploadId", mp.get_upload_id().c_str());
       dump_owner(s, s->user.user_id, s->user.display_name, "Initiator");
       dump_owner(s, s->user.user_id, s->user.display_name);
-      s->formatter->dump_value_str("StorageClass", "STANDARD");
+      s->formatter->dump_format("StorageClass", "STANDARD");
       dump_time(s, "Initiated", &iter->obj.mtime);
       s->formatter->close_section("Upload");
     }
@@ -394,7 +394,7 @@ void RGWListBucketMultiparts_REST_S3::send_response()
       s->formatter->open_array_section("CommonPrefixes");
       map<string, bool>::iterator pref_iter;
       for (pref_iter = common_prefixes.begin(); pref_iter != common_prefixes.end(); ++pref_iter) {
-        s->formatter->dump_value_str("CommonPrefixes.Prefix", pref_iter->first.c_str());
+        s->formatter->dump_format("CommonPrefixes.Prefix", pref_iter->first.c_str());
       }
       s->formatter->close_section("CommonPrefixes");
     }