From 94bf8dcd4ebc5d891f93e7fb484adcc32bc9e9ca Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 24 Mar 2015 21:43:28 +0900
Subject: [PATCH] src: Refactor util::hexdump

---
 src/util.cc | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/util.cc b/src/util.cc
index ab948d7e..6c95a659 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1046,20 +1046,18 @@ std::string make_hostport(const char *host, uint16_t port) {
   return hostport;
 }
 
-#define NGHTTP2_SPACES                                                         \
-  "                                                                          " \
-  "     "
-
 namespace {
 void hexdump8(FILE *out, const uint8_t *first, const uint8_t *last) {
   auto stop = std::min(first + 8, last);
   for (auto k = first; k != stop; ++k) {
     fprintf(out, "%02x ", *k);
   }
-  /* each byte needs 3 spaces (2 hex value and space).  we have extra
-     space after 8 bytes */
-  fprintf(out, "%.*s", static_cast<int>((first + 8 - stop) * 3 + 1),
-          NGHTTP2_SPACES);
+  // each byte needs 3 spaces (2 hex value and space)
+  for (; stop != first + 8; ++stop) {
+    fputs("   ", out);
+  }
+  // we have extra space after 8 bytes
+  fputc(' ', out);
 }
 } // namespace
 
@@ -1076,11 +1074,11 @@ void hexdump(FILE *out, const uint8_t *src, size_t len) {
     auto nextlen = std::min(static_cast<ptrdiff_t>(16), end - i);
     if (nextlen == buflen &&
         std::equal(std::begin(buf), std::begin(buf) + buflen, i)) {
-      /* as long as adjacent 16 bytes block are the same, we just
-         print single '*'. */
+      // as long as adjacent 16 bytes block are the same, we just
+      // print single '*'.
       if (!repeated) {
         repeated = true;
-        fwrite("*\n", 2, 1, out);
+        fputs("*\n", out);
       }
       i += nextlen;
       continue;
@@ -1088,25 +1086,25 @@ void hexdump(FILE *out, const uint8_t *src, size_t len) {
     repeated = false;
     fprintf(out, "%08lx", static_cast<unsigned long>(i - src));
     if (i == end) {
-      fwrite("\n", 2, 1, out);
+      fputc('\n', out);
       break;
     }
-    fwrite("  ", 2, 1, out);
+    fputs("  ", out);
     hexdump8(out, i, end);
     hexdump8(out, i + 8, std::max(i + 8, end));
-    fwrite("|", 1, 1, out);
+    fputc('|', out);
     auto stop = std::min(i + 16, end);
     buflen = stop - i;
     auto p = buf.data();
     for (; i != stop; ++i) {
       *p++ = *i;
       if (0x20 <= *i && *i <= 0x7e) {
-        fwrite(i, 1, 1, out);
+        fputc(*i, out);
       } else {
-        fwrite(".", 1, 1, out);
+        fputc('.', out);
       }
     }
-    fwrite("|\n", 2, 1, out);
+    fputs("|\n", out);
   }
 }