Merge pull request ceph#60994 from MaxKellermann/formatter

Formatter code cleanup

Reviewed-by: Patrick Donnelly <[email protected]>

Author: MaxKellermann

src/common/Formatter.cc

@@ -85,7 +85,7 @@ FormatterAttrs::FormatterAttrs(const char *attr, ...)
     if (!val)
       break;
 
-    attrs.push_back(make_pair(std::string(s), std::string(val)));
+    attrs.emplace_back(s, val);
     s = va_arg(ap, char *);
   } while (s);
   va_end(ap);
@@ -607,13 +607,11 @@ void XMLFormatter::write_bin_data(const char* buff, int buf_len)
   m_ss.seekg(buf_len);
 }
 
-void XMLFormatter::get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str)
+void XMLFormatter::get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str) const
 {
   CachedStackStringStream css;
 
-  for (std::list<std::pair<std::string, std::string> >::const_iterator iter = attrs->attrs.begin();
-       iter != attrs->attrs.end(); ++iter) {
-    std::pair<std::string, std::string> p = *iter;
+  for (const auto &p : attrs->attrs) {
     *css << " " << p.first << "=" << "\"" << p.second << "\"";
   }
 
@@ -874,9 +872,9 @@ size_t TableFormatter::m_vec_index(std::string_view name)
 std::string TableFormatter::get_section_name(std::string_view name)
 {
   std::string t_name{name};
-  for (size_t i = 0; i < m_section.size(); i++) {
+  for (const auto &i : m_section) {
     t_name.insert(0, ":");
-    t_name.insert(0, m_section[i]);
+    t_name.insert(0, i);
   }
   if (m_section_open) {
     std::stringstream lss;
@@ -996,13 +994,11 @@ void TableFormatter::write_raw_data(const char *data) {
   // not supported
 }
 
-void TableFormatter::get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str)
+void TableFormatter::get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str) const
 {
   CachedStackStringStream css;
 
-  for (std::list<std::pair<std::string, std::string> >::const_iterator iter = attrs->attrs.begin();
-       iter != attrs->attrs.end(); ++iter) {
-    std::pair<std::string, std::string> p = *iter;
+  for (const auto &p : attrs->attrs) {
     *css << " " << p.first << "=" << "\"" << p.second << "\"";
   }
 

src/common/Formatter.h

@@ -328,7 +328,7 @@ namespace ceph {
     void open_section_in_ns(std::string_view name, const char *ns, const FormatterAttrs *attrs);
     void finish_pending_string();
     void print_spaces();
-    void get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str);
+    void get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str) const;
     char to_lower_underscore(char c) const;
     std::string get_xml_name(std::string_view name) const;
 
@@ -376,7 +376,7 @@ namespace ceph {
 
     int get_len() const override;
     void write_raw_data(const char *data) override;
-    void get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str);
+    void get_attrs_str(const FormatterAttrs *attrs, std::string& attrs_str) const;
 
   private:
     template <class T>