From 45bc0f34899de4afd794aa8a2b099eb16e3f965a Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 31 Jan 2013 09:34:32 +0100
Subject: [PATCH] tprintf: xutils: Move tput*_safe to tprintf.c

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 tprintf.c | 20 ++++++++++++++++++++
 tprintf.h |  3 +++
 xutils.c  | 19 -------------------
 xutils.h  |  2 --
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tprintf.c b/tprintf.c
index bbdfb552..3fdcb869 100644
--- a/tprintf.c
+++ b/tprintf.c
@@ -2,10 +2,12 @@
  * netsniff-ng - the packet sniffing beast
  * By Daniel Borkmann <daniel@netsniff-ng.org>
  * Copyright 2009, 2010 Daniel Borkmann.
+ * Copyright 2013 Tobias Klauser.
  * Subject to the GPL, version 2.
  */
 
 #define _BSD_SOURCE
+#include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
 
@@ -132,3 +134,21 @@ void tprintf(char *msg, ...)
 
 	spinlock_unlock(&buffer_lock);
 }
+
+void tputchar_safe(int c)
+{
+	unsigned char ch = (unsigned char)(c & 0xff);
+
+	if (isprint(ch))
+		tprintf("%c", ch);
+	else
+		tprintf("\\0x%02x", ch);
+}
+
+void tputs_safe(const char *str, size_t len)
+{
+	while (len--) {
+		tputchar_safe(*str);
+		str++;
+	}
+}
diff --git a/tprintf.h b/tprintf.h
index f36d63db..7085a211 100644
--- a/tprintf.h
+++ b/tprintf.h
@@ -17,6 +17,9 @@ extern void tprintf(char *msg, ...) __check_format_printf(1, 2);
 extern void tprintf_flush(void);
 extern void tprintf_cleanup(void);
 
+extern void tputchar_safe(int c);
+extern void tputs_safe(const char *str, size_t len);
+
 #define colorize_start(fore)			"\033[" __##fore "m"
 #define colorize_start_full(fore, back)		"\033[" __##fore ";" __on_##back "m"
 #define colorize_end()				"\033[" __reset "m"
diff --git a/xutils.c b/xutils.c
index 348fcc19..47f33e82 100644
--- a/xutils.c
+++ b/xutils.c
@@ -4,7 +4,6 @@
  * Copyright 2009, 2010 Daniel Borkmann.
  * Copyright 2009, 2010 Emmanuel Roullit.
  * Copyright 2010 Marek Polacek.
- * Copyright 2013 Tobias Klauser.
  * Subject to the GPL, version 2.
  */
 
@@ -1171,21 +1170,3 @@ char *strtrim_left(register char *p, register char c)
 
 	return p;
 }
-
-void tputchar_safe(int c)
-{
-	unsigned char ch = (unsigned char)(c & 0xff);
-
-	if (isprint(ch))
-		tprintf("%c", ch);
-	else
-		tprintf("\\0x%02x", ch);
-}
-
-void tputs_safe(const char *str, size_t len)
-{
-	while (len--) {
-		tputchar_safe(*str);
-		str++;
-	}
-}
diff --git a/xutils.h b/xutils.h
index 27ca4133..21a547e0 100644
--- a/xutils.h
+++ b/xutils.h
@@ -108,8 +108,6 @@ extern noinline void *xmemset(void *s, int c, size_t n);
 extern char *getuint(char *in, uint32_t *out);
 extern char *strtrim_right(register char *p, register char c);
 extern char *strtrim_left(register char *p, register char c);
-extern void tputchar_safe(int c);
-extern void tputs_safe(const char *str, size_t len);
 
 static inline int get_default_sched_policy(void)
 {
-- 
2.11.4.GIT