From 9cb54f73a41e368c33a0a4a8625102bcbbddfb93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Korina=20=C5=A0imi=C4=8Devi=C4=87?=
 <korina.simicevic@mireo.com>
Date: Thu, 15 Feb 2024 09:19:21 +0100
Subject: [PATCH] Remove unnecessary casts to unsigned types

Summary: related to T12015

Reviewers: ivica

Reviewed By: ivica

Subscribers: miljen, iljazovic

Differential Revision: https://repo.mireo.local/D27927
---
 include/async_mqtt5/impl/assemble_op.hpp     | 9 ++++-----
 include/async_mqtt5/impl/disconnect_op.hpp   | 6 ++----
 include/async_mqtt5/impl/publish_send_op.hpp | 6 ++----
 include/async_mqtt5/impl/subscribe_op.hpp    | 6 ++----
 include/async_mqtt5/impl/unsubscribe_op.hpp  | 6 ++----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/include/async_mqtt5/impl/assemble_op.hpp b/include/async_mqtt5/impl/assemble_op.hpp
index cbd77ac..644251a 100644
--- a/include/async_mqtt5/impl/assemble_op.hpp
+++ b/include/async_mqtt5/impl/assemble_op.hpp
@@ -153,13 +153,12 @@ public:
 			return complete(client::error::malformed_packet, 0, {}, {});
 		}
 
-		auto recv_size = static_cast<size_t>(
-			_svc.connect_property(prop::maximum_packet_size).value_or(max_recv_size)
-		);
-		if (*varlen > recv_size - std::distance(_data_span.first(), first))
+		auto recv_size = _svc.connect_property(prop::maximum_packet_size)
+			.value_or(max_recv_size);
+		if (static_cast<uint32_t>(*varlen) > recv_size - std::distance(_data_span.first(), first))
 			return complete(client::error::malformed_packet, 0, {}, {});
 
-		if (static_cast<uint32_t>(std::distance(first, _data_span.last())) < *varlen)
+		if (std::distance(first, _data_span.last()) < *varlen)
 			return perform(asio::transfer_at_least(1));
 
 		_data_span.remove_prefix(
diff --git a/include/async_mqtt5/impl/disconnect_op.hpp b/include/async_mqtt5/impl/disconnect_op.hpp
index cfc4a32..4db305d 100644
--- a/include/async_mqtt5/impl/disconnect_op.hpp
+++ b/include/async_mqtt5/impl/disconnect_op.hpp
@@ -71,10 +71,8 @@ public:
 			static_cast<uint8_t>(_context.reason_code), _context.props
 		);
 
-		auto max_packet_size = static_cast<size_t>(
-			_svc_ptr->connack_property(prop::maximum_packet_size)
-				.value_or(default_max_send_size)
-		);
+		auto max_packet_size = _svc_ptr->connack_property(prop::maximum_packet_size)
+				.value_or(default_max_send_size);
 		if (disconnect.size() > max_packet_size)
 			// drop properties
 			return send_disconnect(control_packet<allocator_type>::of(
diff --git a/include/async_mqtt5/impl/publish_send_op.hpp b/include/async_mqtt5/impl/publish_send_op.hpp
index 14872eb..19f32c2 100644
--- a/include/async_mqtt5/impl/publish_send_op.hpp
+++ b/include/async_mqtt5/impl/publish_send_op.hpp
@@ -116,10 +116,8 @@ public:
 			qos_type, retain, dup_e::no, props
 		);
 
-		auto max_packet_size = static_cast<size_t>(
-			_svc_ptr->connack_property(prop::maximum_packet_size)
-				.value_or(default_max_send_size)
-		);
+		auto max_packet_size = _svc_ptr->connack_property(prop::maximum_packet_size)
+				.value_or(default_max_send_size);
 		if (publish.size() > max_packet_size)
 			return complete_post(client::error::packet_too_large, packet_id);
 
diff --git a/include/async_mqtt5/impl/subscribe_op.hpp b/include/async_mqtt5/impl/subscribe_op.hpp
index 8b8ed66..5db40f9 100644
--- a/include/async_mqtt5/impl/subscribe_op.hpp
+++ b/include/async_mqtt5/impl/subscribe_op.hpp
@@ -92,10 +92,8 @@ public:
 			topics, props
 		);
 
-		auto max_packet_size = static_cast<size_t>(
-			_svc_ptr->connack_property(prop::maximum_packet_size)
-				.value_or(default_max_send_size)
-		);
+		auto max_packet_size = _svc_ptr->connack_property(prop::maximum_packet_size)
+				.value_or(default_max_send_size);
 		if (subscribe.size() > max_packet_size)
 			return complete_post(client::error::packet_too_large, packet_id);
 
diff --git a/include/async_mqtt5/impl/unsubscribe_op.hpp b/include/async_mqtt5/impl/unsubscribe_op.hpp
index 6306f9f..6d397af 100644
--- a/include/async_mqtt5/impl/unsubscribe_op.hpp
+++ b/include/async_mqtt5/impl/unsubscribe_op.hpp
@@ -87,10 +87,8 @@ public:
 			topics, props
 		);
 
-		auto max_packet_size = static_cast<size_t>(
-			_svc_ptr->connack_property(prop::maximum_packet_size)
-				.value_or(default_max_send_size)
-		);
+		auto max_packet_size = _svc_ptr->connack_property(prop::maximum_packet_size)
+				.value_or(default_max_send_size);
 		if (unsubscribe.size() > max_packet_size)
 			return complete_post(client::error::packet_too_large, packet_id);