diff options
| author | Dan Mick <dan.mick@inktank.com> | 2013-07-26 22:52:27 -0700 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2013-08-06 13:13:42 -0700 |
| commit | 0017010735c0bf883251a72d84c32399aee8192c (patch) | |
| tree | d4d88922c5947bc8490dc2d9cd25560c228eb841 | |
| parent | e904018872b90c48e92c0a1df9a74ffc1f2ab84f (diff) | |
| download | ceph-0017010735c0bf883251a72d84c32399aee8192c.tar.gz | |
mon, osd: Clean up "flush(stringstream)" continued
Missing files in last commit; sorry!
Signed-off-by: Dan Mick <dan.mick@inktank.com>
| -rw-r--r-- | src/common/cmdparse.cc | 6 | ||||
| -rw-r--r-- | src/common/cmdparse.h | 6 | ||||
| -rw-r--r-- | src/mon/Monitor.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc index 370591cb3bb..16c62349c40 100644 --- a/src/common/cmdparse.cc +++ b/src/common/cmdparse.cc @@ -27,7 +27,7 @@ using namespace std; */ void -dump_cmd_to_json(JSONFormatter *f, const string& cmd) +dump_cmd_to_json(Formatter *f, const string& cmd) { // put whole command signature in an already-opened container // elements are: "name", meaning "the typeless name that means a literal" @@ -77,7 +77,7 @@ dump_cmd_to_json(JSONFormatter *f, const string& cmd) } void -dump_cmd_and_help_to_json(JSONFormatter *jf, +dump_cmd_and_help_to_json(Formatter *jf, const string& secname, const string& cmdsig, const string& helptext) @@ -91,7 +91,7 @@ dump_cmd_and_help_to_json(JSONFormatter *jf, } void -dump_cmddesc_to_json(JSONFormatter *jf, +dump_cmddesc_to_json(Formatter *jf, const string& secname, const string& cmdsig, const string& helptext, diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h index 58c66b46052..10e43ab0abe 100644 --- a/src/common/cmdparse.h +++ b/src/common/cmdparse.h @@ -20,12 +20,12 @@ class CephContext; typedef boost::variant<std::string, bool, int64_t, double, std::vector<std::string> > cmd_vartype; typedef std::map<std::string, cmd_vartype> cmdmap_t; -void dump_cmd_to_json(ceph::JSONFormatter *f, const std::string& cmd); -void dump_cmd_and_help_to_json(ceph::JSONFormatter *f, +void dump_cmd_to_json(ceph::Formatter *f, const std::string& cmd); +void dump_cmd_and_help_to_json(ceph::Formatter *f, const std::string& secname, const std::string& cmd, const std::string& helptext); -void dump_cmddesc_to_json(JSONFormatter *jf, +void dump_cmddesc_to_json(ceph::Formatter *jf, const std::string& secname, const std::string& cmdsig, const std::string& helptext, diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index b55aff0a190..a9d3e48a3be 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1937,7 +1937,7 @@ void Monitor::handle_command(MMonCommand *m) cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); if (prefix == "get_command_descriptions") { int cmdnum = 0; - JSONFormatter *f = new JSONFormatter(); + Formatter *f = new_formatter("json"); f->open_object_section("command_descriptions"); for (MonCommand *cp = mon_commands; cp < &mon_commands[ARRAY_SIZE(mon_commands)]; cp++) { |