Uncrustify

Signed-off-by: Juan Lopez Fernandez <[email protected]>
eProsima · Mar 12, 2024 · 44ac760 · 44ac760
1 parent 76d7338
commit 44ac760
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 31 deletions.
diff --git a/include/fastdds/rtps/transport/TransportDescriptorInterface.h b/include/fastdds/rtps/transport/TransportDescriptorInterface.h
@@ -53,8 +53,8 @@ struct TransportDescriptorInterface
     //! Copy constructor
     RTPS_DllAPI TransportDescriptorInterface(
             const TransportDescriptorInterface& t)
-    : maxMessageSize(t.maxMessageSize)
-    , maxInitialPeersRange(t.maxInitialPeersRange)
+        : maxMessageSize(t.maxMessageSize)
+        , maxInitialPeersRange(t.maxInitialPeersRange)
     {
     }
 

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -342,7 +342,8 @@ RTPSParticipantImpl::RTPSParticipantImpl(
             }
         }
 
-        bool transport_registered = register_transport && m_network_Factory.RegisterTransport(transportDescriptor.get(), &m_att.properties, m_att.max_msg_size_no_frag);
+        bool transport_registered = register_transport && m_network_Factory.RegisterTransport(
+            transportDescriptor.get(), &m_att.properties, m_att.max_msg_size_no_frag);
 
         if (socket_descriptor != nullptr)
         {
@@ -386,9 +387,11 @@ RTPSParticipantImpl::RTPSParticipantImpl(
     }
 
     // Check netmask filtering preconditions
-    std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info = m_network_Factory.netmask_filter_info();
+    std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info =
+            m_network_Factory.netmask_filter_info();
     std::string error_msg;
-    if (!fastdds::rtps::network::netmask_filter::check_preconditions(netmask_filter_info, m_att.ignore_non_matching_locators,
+    if (!fastdds::rtps::network::netmask_filter::check_preconditions(netmask_filter_info,
+            m_att.ignore_non_matching_locators,
             error_msg) ||
             !fastdds::rtps::network::netmask_filter::check_preconditions(netmask_filter_info,
             m_att.builtin.metatraffic_external_unicast_locators,

diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -130,7 +130,7 @@ TCPTransportDescriptor::TCPTransportDescriptor(
 TCPTransportDescriptor& TCPTransportDescriptor::operator =(
         const TCPTransportDescriptor& t)
 {
-    SocketTransportDescriptor::operator=(t);
+    SocketTransportDescriptor::operator =(t);
     listening_ports = t.listening_ports;
     keep_alive_frequency_ms = t.keep_alive_frequency_ms;
     keep_alive_timeout_ms = t.keep_alive_timeout_ms;

diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -309,9 +309,9 @@ class TCPTransportInterface : public TransportInterface
      *   If there is an existing channel it registers the receiver resource.
      */
     virtual bool OpenInputChannel(
-        const Locator&,
-        TransportReceiverInterface*,
-        uint32_t) override;
+            const Locator&,
+            TransportReceiverInterface*,
+            uint32_t) override;
 
     //! Opens a socket on the given address and port (as long as they are white listed).
     bool OpenOutputChannel(

diff --git a/src/cpp/rtps/transport/TCPv4Transport.cpp b/src/cpp/rtps/transport/TCPv4Transport.cpp
@@ -138,7 +138,8 @@ TCPv4Transport::TCPv4Transport(
             else if (descriptor.interfaceWhiteList.empty() && descriptor.interface_allowlist.empty())
             {
                 interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                        descriptor.netmask_filter);
             }
             else if (!descriptor.interface_allowlist.empty())
             {
@@ -156,7 +157,8 @@ TCPv4Transport::TCPv4Transport(
                             descriptor.netmask_filter))
                     {
                         interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, netmask_filter);
+                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                                netmask_filter);
                     }
                     else
                     {
@@ -176,7 +178,8 @@ TCPv4Transport::TCPv4Transport(
                         }) != white_end )
                 {
                     interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                            descriptor.netmask_filter);
                 }
             }
         }

diff --git a/src/cpp/rtps/transport/TCPv6Transport.cpp b/src/cpp/rtps/transport/TCPv6Transport.cpp
@@ -143,7 +143,8 @@ TCPv6Transport::TCPv6Transport(
             else if (descriptor.interfaceWhiteList.empty() && descriptor.interface_allowlist.empty())
             {
                 interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                        descriptor.netmask_filter);
             }
             else if (!descriptor.interface_allowlist.empty())
             {
@@ -162,7 +163,8 @@ TCPv6Transport::TCPv6Transport(
                             descriptor.netmask_filter))
                     {
                         interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, netmask_filter);
+                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                                netmask_filter);
                     }
                     else
                     {
@@ -182,7 +184,8 @@ TCPv6Transport::TCPv6Transport(
                         }) != white_end )
                 {
                     interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                            descriptor.netmask_filter);
                 }
             }
         }

diff --git a/src/cpp/rtps/transport/UDPv4Transport.cpp b/src/cpp/rtps/transport/UDPv4Transport.cpp
@@ -169,7 +169,8 @@ UDPv4Transport::UDPv4Transport(
             else if (descriptor.interfaceWhiteList.empty() && descriptor.interface_allowlist.empty())
             {
                 interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                        descriptor.netmask_filter);
             }
             else if (!descriptor.interface_allowlist.empty())
             {
@@ -187,7 +188,8 @@ UDPv4Transport::UDPv4Transport(
                             descriptor.netmask_filter))
                     {
                         interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, netmask_filter);
+                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                                netmask_filter);
                     }
                     else
                     {
@@ -207,7 +209,8 @@ UDPv4Transport::UDPv4Transport(
                         }) != white_end )
                 {
                     interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
-                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                            descriptor.netmask_filter);
                 }
             }
         }

diff --git a/src/cpp/rtps/transport/UDPv4Transport.h b/src/cpp/rtps/transport/UDPv4Transport.h
@@ -55,9 +55,9 @@ class UDPv4Transport : public UDPTransportInterface
      * multicast range, it joins the specified multicast group,
      */
     bool OpenInputChannel(
-        const Locator&,
-        TransportReceiverInterface*,
-        uint32_t) override;
+            const Locator&,
+            TransportReceiverInterface*,
+            uint32_t) override;
 
     LocatorList NormalizeLocator(
             const Locator& locator) override;

diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp
@@ -169,7 +169,8 @@ UDPv6Transport::UDPv6Transport(
             else if (descriptor.interfaceWhiteList.empty() && descriptor.interface_allowlist.empty())
             {
                 interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                        descriptor.netmask_filter);
             }
             else if (!descriptor.interface_allowlist.empty())
             {
@@ -188,7 +189,8 @@ UDPv6Transport::UDPv6Transport(
                             descriptor.netmask_filter))
                     {
                         interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, netmask_filter);
+                        allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                                netmask_filter);
                     }
                     else
                     {
@@ -208,7 +210,8 @@ UDPv6Transport::UDPv6Transport(
                         }) != white_end )
                 {
                     interface_whitelist_.emplace_back(ip::address_v6::from_string(infoIP.name));
-                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator, descriptor.netmask_filter);
+                    allowed_interfaces_.emplace_back(infoIP.dev, infoIP.name, infoIP.masked_locator,
+                            descriptor.netmask_filter);
                 }
             }
         }

diff --git a/src/cpp/rtps/transport/UDPv6Transport.h b/src/cpp/rtps/transport/UDPv6Transport.h
@@ -55,9 +55,9 @@ class UDPv6Transport : public UDPTransportInterface
      * multicast range, it joins the specified multicast group,
      */
     bool OpenInputChannel(
-        const Locator&,
-        TransportReceiverInterface*,
-        uint32_t) override;
+            const Locator&,
+            TransportReceiverInterface*,
+            uint32_t) override;
 
     LocatorList NormalizeLocator(
             const Locator& locator) override;

diff --git a/src/cpp/rtps/transport/network/NetworkInterface.cpp b/src/cpp/rtps/transport/network/NetworkInterface.cpp
@@ -42,9 +42,9 @@ bool NetworkInterface::operator ==(
         const NetworkInterface& iface) const
 {
     return (this->name == iface.name &&
-        this->device == iface.device &&
-        this->ip == iface.ip &&
-        this->locator == iface.locator);
+           this->device == iface.device &&
+           this->ip == iface.ip &&
+           this->locator == iface.locator);
 }
 
 } // namsepace rtps

diff --git a/src/cpp/rtps/transport/network/NetworkInterfaceWithFilter.cpp b/src/cpp/rtps/transport/network/NetworkInterfaceWithFilter.cpp
@@ -58,7 +58,7 @@ bool NetworkInterfaceWithFilter::operator ==(
         const NetworkInterfaceWithFilter& iface) const
 {
     return (this->netmask_filter == iface.netmask_filter &&
-        NetworkInterface::operator ==(iface));
+           NetworkInterface::operator ==(iface));
 }
 
 } // namsepace rtps