Bluetooth: Classic: SDP: Replace magic numbers

Replace magic UUID sizes with `sizeof(uint8_t) +
BT_UUID_SIZE_{16,32,128}`.

Signed-off-by: Jonas Spinner <[email protected]>

Author: jonas-5ae29c

subsys/bluetooth/host/classic/sdp.c

@@ -1523,19 +1523,19 @@ static int sdp_client_ss_search(struct bt_sdp_client *session,
 	switch (param->uuid->type) {
 	case BT_UUID_TYPE_16:
 		/* Seq length */
-		net_buf_add_u8(buf, 0x03);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_16);
 		/* Seq type */
 		net_buf_add_u8(buf, BT_SDP_UUID16);
 		/* Seq value */
 		net_buf_add_be16(buf, BT_UUID_16(param->uuid)->val);
 		break;
 	case BT_UUID_TYPE_32:
-		net_buf_add_u8(buf, 0x05);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_32);
 		net_buf_add_u8(buf, BT_SDP_UUID32);
 		net_buf_add_be32(buf, BT_UUID_32(param->uuid)->val);
 		break;
 	case BT_UUID_TYPE_128:
-		net_buf_add_u8(buf, 0x11);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_128);
 		net_buf_add_u8(buf, BT_SDP_UUID128);
 		sys_memcpy_swap(uuid128, BT_UUID_128(param->uuid)->val, sizeof(uuid128));
 		net_buf_add_mem(buf, uuid128, sizeof(uuid128));
@@ -1630,19 +1630,19 @@ static int sdp_client_ssa_search(struct bt_sdp_client *session,
 	switch (param->uuid->type) {
 	case BT_UUID_TYPE_16:
 		/* Seq length */
-		net_buf_add_u8(buf, 0x03);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_16);
 		/* Seq type */
 		net_buf_add_u8(buf, BT_SDP_UUID16);
 		/* Seq value */
 		net_buf_add_be16(buf, BT_UUID_16(param->uuid)->val);
 		break;
 	case BT_UUID_TYPE_32:
-		net_buf_add_u8(buf, 0x05);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_32);
 		net_buf_add_u8(buf, BT_SDP_UUID32);
 		net_buf_add_be32(buf, BT_UUID_32(param->uuid)->val);
 		break;
 	case BT_UUID_TYPE_128:
-		net_buf_add_u8(buf, 0x11);
+		net_buf_add_u8(buf, sizeof(uint8_t) + BT_UUID_SIZE_128);
 		net_buf_add_u8(buf, BT_SDP_UUID128);
 		sys_memcpy_swap(uuid128, BT_UUID_128(param->uuid)->val, sizeof(uuid128));
 		net_buf_add_mem(buf, uuid128, sizeof(uuid128));
@@ -2494,23 +2494,23 @@ static inline ssize_t sdp_get_uuid_len(const uint8_t *data, size_t len)
 
 	switch (data[0]) {
 	case BT_SDP_UUID16:
-		if (len < 3) {
+		if (len < (sizeof(uint8_t) + BT_UUID_SIZE_16)) {
 			break;
 		}
 
-		return 3;
+		return sizeof(uint8_t) + BT_UUID_SIZE_16;
 	case BT_SDP_UUID32:
-		if (len < 5) {
+		if (len < (sizeof(uint8_t) + BT_UUID_SIZE_32)) {
 			break;
 		}
 
-		return 5;
+		return sizeof(uint8_t) + BT_UUID_SIZE_32;
 	case BT_SDP_UUID128:
-		if (len < (BT_UUID_SIZE_128 + sizeof(uint8_t))) {
+		if (len < (sizeof(uint8_t) + BT_UUID_SIZE_128)) {
 			break;
 		}
 
-		return BT_UUID_SIZE_128 + sizeof(uint8_t);
+		return sizeof(uint8_t) + BT_UUID_SIZE_128;
 	default:
 		LOG_ERR("Invalid/unhandled DTD 0x%02x", data[0]);
 		return -EINVAL;