buffer: add no-newline hexdump option

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index baf97828091a4ad1957822ec893f00190656a84c..b809d92621f327e2ed952593a4e8001570260474 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -2339,7 +2339,7 @@ void buffer::list::write_stream(std::ostream &out) const
 }
 
 
-void buffer::list::hexdump(std::ostream &out) const
+void buffer::list::hexdump(std::ostream &out, bool trailing_newline) const
 {
   if (!length())
     return;
@@ -2377,7 +2377,8 @@ void buffer::list::hexdump(std::ostream &out) const
        did_star = false;
       }
     }
-
+    if (o)
+      out << "\n";
     out << std::hex << std::setw(8) << o << " ";
 
     unsigned i;
@@ -2400,9 +2401,12 @@ void buffer::list::hexdump(std::ostream &out) const
       else
        out << '.';
     }
-    out << '|' << std::dec << std::endl;
+    out << '|' << std::dec;
+  }
+  if (trailing_newline) {
+    out << "\n" << std::hex << std::setw(8) << length();
+    out << "\n";
   }
-  out << std::hex << std::setw(8) << length() << "\n";
 
   out.flags(original_flags);
 }

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 9441cd583d2313dca8bcb34d99c83dfd09c06162..a4e89005a5c466167443725046b8792fea543d45 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -580,7 +580,7 @@ namespace buffer CEPH_BUFFER_API {
     void decode_base64(list& o);
 
     void write_stream(std::ostream &out) const;
-    void hexdump(std::ostream &out) const;
+    void hexdump(std::ostream &out, bool trailing_newline = true) const;
     int read_file(const char *fn, std::string *error);
     ssize_t read_fd(int fd, size_t len);
     int read_fd_zero_copy(int fd, size_t len);