From: Kefu Chai <kchai@redhat.com>
Date: Wed, 2 Dec 2015 08:02:14 +0000 (+0800)
Subject: tools/rados: support more --format options
X-Git-Tag: v10.1.0~303^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50bbf7f92edf9e9492c4a480a3492cb25f678770;p=ceph.git

tools/rados: support more --format options

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index fb4967f7579..1538ee27527 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1407,11 +1407,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
   i = opts.find("format");
   if (i != opts.end()) {
     const char *format = i->second.c_str();
-    if (strcmp(format, "xml") == 0)
-      formatter = new XMLFormatter(pretty_format);
-    else if (strcmp(format, "json") == 0)
-      formatter = new JSONFormatter(pretty_format);
-    else {
+    formatter = Formatter::create(format);
+    if (!formatter) {
       cerr << "unrecognized format: " << format << std::endl;
       return -EINVAL;
     }