From 40481e895453c53d71f2f254b931b77c830c9e0a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 30 Jul 2010 11:40:32 +0200 Subject: move hexdump() from logging.c to utils.c --- src/logging.c | 19 ------------------- src/rsl.c | 1 + src/utils.c | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/logging.c b/src/logging.c index 1dc30db3..2cc44e79 100644 --- a/src/logging.c +++ b/src/logging.c @@ -236,25 +236,6 @@ void logp2(unsigned int subsys, unsigned int level, char *file, int line, int co va_end(ap); } -static char hexd_buff[4096]; - -char *hexdump(const unsigned char *buf, int len) -{ - int i; - char *cur = hexd_buff; - - hexd_buff[0] = 0; - for (i = 0; i < len; i++) { - int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); - int rc = snprintf(cur, len_remain, "%02x ", buf[i]); - if (rc <= 0) - break; - cur += rc; - } - hexd_buff[sizeof(hexd_buff)-1] = 0; - return hexd_buff; -} - void log_add_target(struct log_target *target) { llist_add_tail(&target->entry, &target_list); diff --git a/src/rsl.c b/src/rsl.c index 10fba9b2..3bfeffb9 100644 --- a/src/rsl.c +++ b/src/rsl.c @@ -22,6 +22,7 @@ */ #include +#include #include #include diff --git a/src/utils.c b/src/utils.c index 05381c8b..a6c2d6d2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -75,3 +75,22 @@ int hexparse(const char *str, uint8_t *b, int max_len) return i>>1; } + +static char hexd_buff[4096]; + +char *hexdump(const unsigned char *buf, int len) +{ + int i; + char *cur = hexd_buff; + + hexd_buff[0] = 0; + for (i = 0; i < len; i++) { + int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); + int rc = snprintf(cur, len_remain, "%02x ", buf[i]); + if (rc <= 0) + break; + cur += rc; + } + hexd_buff[sizeof(hexd_buff)-1] = 0; + return hexd_buff; +} -- cgit v1.2.3