summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2022-05-16 17:37:56 -0700
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2022-05-18 15:35:46 -0700
commit0247ed333ea9dc0ac914bae68225d5cb3f288f80 (patch)
tree189257972d73cfb6b60c2535b5eda630827b522c /monitor
parentf66673878a9f3745c9cb3cfaa85b5b8f99a929d6 (diff)
downloadbluez-0247ed333ea9dc0ac914bae68225d5cb3f288f80.tar.gz
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.
Diffstat (limited to 'monitor')
-rw-r--r--monitor/display.h14
-rw-r--r--monitor/l2cap.c14
-rw-r--r--monitor/packet.c14
3 files changed, 14 insertions, 28 deletions
diff --git a/monitor/display.h b/monitor/display.h
index be5739833..5a82f8e6f 100644
--- a/monitor/display.h
+++ b/monitor/display.h
@@ -76,6 +76,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);
+}
+
void set_default_pager_num_columns(int num_columns);
int num_columns(void);
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 01825ce0a..192b6c920 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -2123,20 +2123,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 d80735a06..2e02b3923 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -1755,20 +1755,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);