common: Move hex dump functions into hex.h

Move hex dump functions into hex.h. Remove unecessary includes from
debug.cc

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 87c53e80d17a0fe252c6006d74822af7dff03ce0..561b3c09a3a02184affd670fda07546892ad2e35 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -535,7 +535,8 @@ libcommon_files = \
        common/lockdep.cc \
        common/DoutStreambuf.cc \
        common/debug.cc \
-       common/version.cc
+       common/version.cc \
+       common/hex.cc
 
 libcrush_a_SOURCES = \
        crush/builder.c \
@@ -655,6 +656,7 @@ noinst_HEADERS = \
        common/WorkQueue.h\
        common/debug.h\
        common/version.h\
+       common/hex.h\
        common/errno.h\
        common/likely.h\
        common/lockdep.h\

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index 30861e9ec2a06c8298bb16711801ba4a3b524deb..e77082e7b8e761dfd45b5caca8675b6d15ce5629 100644 (file)
--- a/src/auth/Crypto.cc
+++ b/src/auth/Crypto.cc
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "common/armor.h"
 #include "common/Clock.h"
+#include "common/hex.h"
 #include "common/safe_io.h"
 
 #include <errno.h>

diff --git a/src/common/debug.cc b/src/common/debug.cc
index 7bf1049f94bd7f5fff4d4bfee48910ff9e330e3e..12a51717108b7fb6608c08e79451edc8f27547c2 100644 (file)
--- a/src/common/debug.cc
+++ b/src/common/debug.cc
@@ -1,11 +1,7 @@
-#include "Mutex.h"
-#include "ceph_ver.h"
 #include "common/DoutStreambuf.h"
 #include "config.h"
 #include "debug.h"
 
-#include <errno.h>
-#include <fstream>
 #include <iostream>
 #include <sstream>
 
@@ -56,23 +52,3 @@ int dout_create_rank_symlink(int n)
   assert(_doss);
   return _doss->create_rank_symlink(n);
 }
-
-void hex2str(const char *s, int len, char *buf, int dest_len)
-{
-  int pos = 0;
-  for (int i=0; i<len && pos<dest_len; i++) {
-    if (i && !(i%8))
-      pos += snprintf(&buf[pos], dest_len-pos, " ");
-    if (i && !(i%16))
-      pos += snprintf(&buf[pos], dest_len-pos, "\n");
-    pos += snprintf(&buf[pos], dest_len-pos, "%.2x ", (int)(unsigned char)s[i]);
-  }
-}
-
-void hexdump(string msg, const char *s, int len)
-{
-  int buf_len = len*4;
-  char buf[buf_len];
-  hex2str(s, len, buf, buf_len);
-  generic_dout(0) << msg << ":\n" << buf << dendl;
-}

diff --git a/src/common/debug.h b/src/common/debug.h
index f7a2c0ba3eaf3b795738fd03999c146fbdbec993..d0deb37af2b732c82f56a80e5c294507c47c896e 100644 (file)
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -98,8 +98,4 @@ inline std::ostream& operator<<(std::ostream& out, _bad_endl_use_dendl_t) {
 
 #define derr dout(-1)
 
-extern void hex2str(const char *s, int len, char *buf, int dest_len);
-
-extern void hexdump(std::string msg, const char *s, int len);
-
 #endif

diff --git a/src/common/hex.cc b/src/common/hex.cc
new file mode 100644 (file)
index 0000000..114318c
--- /dev/null
+++ b/src/common/hex.cc
@@ -0,0 +1,40 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2008-2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#include "config.h"
+#include "common/debug.h"
+#include "common/hex.h"
+
+#include <stdio.h>
+#include <string>
+
+void hex2str(const char *s, int len, char *buf, int dest_len)
+{
+  int pos = 0;
+  for (int i=0; i<len && pos<dest_len; i++) {
+    if (i && !(i%8))
+      pos += snprintf(&buf[pos], dest_len-pos, " ");
+    if (i && !(i%16))
+      pos += snprintf(&buf[pos], dest_len-pos, "\n");
+    pos += snprintf(&buf[pos], dest_len-pos, "%.2x ", (int)(unsigned char)s[i]);
+  }
+}
+
+void hexdump(std::string msg, const char *s, int len)
+{
+  int buf_len = len*4;
+  char buf[buf_len];
+  hex2str(s, len, buf, buf_len);
+  generic_dout(0) << msg << ":\n" << buf << dendl;
+}

diff --git a/src/common/hex.h b/src/common/hex.h
new file mode 100644 (file)
index 0000000..3abc826
--- /dev/null
+++ b/src/common/hex.h
@@ -0,0 +1,25 @@
+
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#ifndef CEPH_COMMON_HEX_H
+#define CEPH_COMMON_HEX_H
+
+#include <string>
+
+extern void hex2str(const char *s, int len, char *buf, int dest_len);
+
+extern void hexdump(std::string msg, const char *s, int len);
+
+#endif