summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-01-02 12:49:33 +0100
committerJacopo Mondi <jacopo@jmondi.org>2019-01-03 09:10:50 +0100
commit4e5a93da8382cb64d3d87e7d288afed4024eed4b (patch)
tree344a77bbd9941d2ec6125ac4599691ea8d8614a4 /src
parent4863d44104b4e7441d5f39e4bf53286175d1e4e8 (diff)
libcamera: media_device: Minor cleanup in findInterface()
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 <niklas.soderlund@ragnatech.se> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/media_device.cpp17
1 files changed, 8 insertions, 9 deletions
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<struct media_v2_link *>
- (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<unsigned int>(-1))
+ if (i == topology.num_links)
return nullptr;
struct media_v2_interface *ifaces = reinterpret_cast<struct media_v2_interface *>
- (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];
}