From a2942af3e53abe373d37fc6ea440c60d2ed7897f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 28 May 2009 11:23:52 -0700
Subject: [PATCH] buffer: fix hexdump formatting

---
 src/common/buffer.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index c985c75a4949e..9ece38444ef47 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -77,12 +77,11 @@ void buffer::list::hexdump(std::ostream &out)
 {
   out.setf(std::ios::right);
   out.fill('0');
-  out << std::hex;
 
   unsigned per = 16;
 
   for (unsigned o=0; o<length(); o += per) {
-    out << std::setw(4) << o << " :";
+    out << std::hex << std::setw(4) << o << " :";
 
     unsigned i;
     for (i=0; i<per && o+i<length(); i++) {
@@ -94,13 +93,12 @@ void buffer::list::hexdump(std::ostream &out)
     out << " : ";
     for (i=0; i<per && o+i<length(); i++) {
       char c = (*this)[o+i];
-      if (isalnum(c))
+      if (isupper(c) || islower(c) || isdigit(c) || c == ' ' || ispunct(c))
 	out << c;
       else
 	out << '.';
     }
-    out << std::endl;
+    out << std::dec << std::endl;
   }
-  out << std::dec;
   out.unsetf(std::ios::right);
 }
-- 
2.39.5