From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Tue, 17 May 2022 00:37:56 +0000 (-0700)
Subject: monitor: Move print_hex_field to display.h
X-Git-Tag: accepted/tizen/unified/20230608.164325~244
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b575dc392959ec16f3937bfcf3ad4435689775c8;p=platform%2Fupstream%2Fbluez.git

monitor: Move print_hex_field to display.h

This moves print_hex_field to display.h and removes the duplicated code
from packet.c and l2cap.c.

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>
---

diff --git a/monitor/display.h b/monitor/display.h
index 2e00ecc..37f6587 100755
--- a/monitor/display.h
+++ b/monitor/display.h
@@ -80,6 +80,20 @@ static inline uint64_t print_bitfield(int indent, uint64_t val,
 	return mask;
 }
 
+static inline void print_hex_field(const char *label, const uint8_t *data,
+								uint8_t len)
+{
+	char str[len * 2 + 1];
+	uint8_t i;
+
+	str[0] = '\0';
+
+	for (i = 0; i < len; i++)
+		sprintf(str + (i * 2), "%2.2x", data[i]);
+
+	print_field("%s: %s", label, str);
+}
+
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
 void set_default_pager_num_columns(int num_columns);
 #endif
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index b468d67..c4b55d9 100755
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -2122,20 +2122,6 @@ static void amp_packet(uint16_t index, bool in, uint16_t handle,
 	opcode_data->func(&frame);
 }
 
-static void print_hex_field(const char *label, const uint8_t *data,
-								uint8_t len)
-{
-	char str[len * 2 + 1];
-	uint8_t i;
-
-	str[0] = '\0';
-
-	for (i = 0; i < len; i++)
-		sprintf(str + (i * 2), "%2.2x", data[i]);
-
-	print_field("%s: %s", label, str);
-}
-
 static void print_uuid(const char *label, const void *data, uint16_t size)
 {
 	const char *str;
diff --git a/monitor/packet.c b/monitor/packet.c
index 7ef0038..b281c23 100755
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -1754,20 +1754,6 @@ static void print_key_size(uint8_t key_size)
 	print_field("Key size: %d", key_size);
 }
 
-static void print_hex_field(const char *label, const uint8_t *data,
-								uint8_t len)
-{
-	char str[len * 2 + 1];
-	uint8_t i;
-
-	str[0] = '\0';
-
-	for (i = 0; i < len; i++)
-		sprintf(str + (i * 2), "%2.2x", data[i]);
-
-	print_field("%s: %s", label, str);
-}
-
 static void print_key(const char *label, const uint8_t *link_key)
 {
 	print_hex_field(label, link_key, 16);