From 4e5a93da8382cb64d3d87e7d288afed4024eed4b Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 2 Jan 2019 12:49:33 +0100 Subject: libcamera: media_device: Minor cleanup in findInterface() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not compare an usigned int with -1 to avoid going through cast. Also align function parameters and long assignement lines while at there. Reviewed-by: Niklas Söderlund Signed-off-by: Jacopo Mondi --- src/libcamera/media_device.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index cc307dac..e1368a13 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -379,13 +379,14 @@ void MediaDevice::clear() * \return A pointer to the interface if found, or nullptr otherwise */ struct media_v2_interface *MediaDevice::findInterface(const struct media_v2_topology &topology, - unsigned int entityId) + unsigned int entityId) { struct media_v2_link *links = reinterpret_cast - (topology.ptr_links); - unsigned int ifaceId = -1; + (topology.ptr_links); + unsigned int ifaceId; + unsigned int i; - for (unsigned int i = 0; i < topology.num_links; ++i) { + for (i = 0; i < topology.num_links; ++i) { /* Search for the interface to entity link. */ if (links[i].sink_id != entityId) continue; @@ -397,14 +398,12 @@ struct media_v2_interface *MediaDevice::findInterface(const struct media_v2_topo ifaceId = links[i].source_id; break; } - - if (ifaceId == static_cast(-1)) + if (i == topology.num_links) return nullptr; struct media_v2_interface *ifaces = reinterpret_cast - (topology.ptr_interfaces); - - for (unsigned int i = 0; i < topology.num_interfaces; ++i) { + (topology.ptr_interfaces); + for (i = 0; i < topology.num_interfaces; ++i) { if (ifaces[i].id == ifaceId) return &ifaces[i]; } -- cgit v1.2.1