Polish code

Signed-off-by: Ze Gan <ganze718@gmail.com>
sonic-net · Nov 19, 2020 · c21d2c9 · c21d2c9
1 parent ba7ae2c
commit c21d2c9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/vslib/inc/MACsecEgressFilter.h b/vslib/inc/MACsecEgressFilter.h
@@ -7,7 +7,8 @@ namespace saivs
     class MACsecEgressFilter : public MACsecFilter
     {
     public:
-        MACsecEgressFilter(_In_ const std::string &macsecInterfaceName);
+        MACsecEgressFilter(
+            _In_ const std::string &macsecInterfaceName);
 
         virtual ~MACsecEgressFilter() = default;
 

diff --git a/vslib/inc/MACsecFilter.h b/vslib/inc/MACsecFilter.h
@@ -6,21 +6,24 @@
 
 namespace saivs
 {
-    class MACsecFilter : public TrafficFilter
+    class MACsecFilter :
+        public TrafficFilter
     {
     public:
         MACsecFilter(
-            _In_ const std::string &macsec_interface_name);
+            _In_ const std::string &macsecInterfaceName);
 
         virtual ~MACsecFilter() = default;
 
         virtual FilterStatus execute(
             _Inout_ void *buffer,
             _Inout_ ssize_t &length) override;
 
-        void enable_macsec_device(bool enable);
+        void enable_macsec_device(
+            _In_ bool enable);
 
-        void set_macsec_fd(int macsecfd);
+        void set_macsec_fd(
+            _In_ int macsecfd);
 
     protected:
         virtual FilterStatus forward(

diff --git a/vslib/inc/MACsecIngressFilter.h b/vslib/inc/MACsecIngressFilter.h
@@ -4,10 +4,12 @@
 
 namespace saivs
 {
-    class MACsecIngressFilter : public MACsecFilter
+    class MACsecIngressFilter :
+        public MACsecFilter
     {
     public:
-        MACsecIngressFilter(_In_ const std::string &macsec_interface_name);
+        MACsecIngressFilter(
+            _In_ const std::string &macsecInterfaceName);
 
         virtual ~MACsecIngressFilter() = default;
 

diff --git a/vslib/src/MACsecEgressFilter.cpp b/vslib/src/MACsecEgressFilter.cpp
@@ -7,7 +7,8 @@
 
 using namespace saivs;
 
-MACsecEgressFilter::MACsecEgressFilter(_In_ const std::string &macsecInterfaceName):
+MACsecEgressFilter::MACsecEgressFilter(
+    _In_ const std::string &macsecInterfaceName):
     MACsecFilter(macsecInterfaceName)
 {
     SWSS_LOG_ENTER();

diff --git a/vslib/src/MACsecFilter.cpp b/vslib/src/MACsecFilter.cpp
@@ -14,23 +14,29 @@ using namespace saivs;
 #define EAPOL_ETHER_TYPE (0x888e)
 
 MACsecFilter::MACsecFilter(
-    _In_ const std::string &macsec_interface_name):
+    _In_ const std::string &macsecInterfaceName):
     m_macsec_device_enable(false),
     m_macsecfd(0),
-    m_macsec_interface_name(macsec_interface_name)
+    m_macsec_interface_name(macsecInterfaceName)
 {
     SWSS_LOG_ENTER();
 
     // empty intentionally
 }
 
-void MACsecFilter::enable_macsec_device(bool enable)
+void MACsecFilter::enable_macsec_device(
+    _In_ bool enable)
 {
+    SWSS_LOG_ENTER();
+
     m_macsec_device_enable = enable;
 }
 
-void MACsecFilter::set_macsec_fd(int macsecfd)
+void MACsecFilter::set_macsec_fd(
+    _In_ int macsecfd)
 {
+    SWSS_LOG_ENTER();
+
     m_macsecfd = macsecfd;
 }
 

diff --git a/vslib/src/MACsecIngressFilter.cpp b/vslib/src/MACsecIngressFilter.cpp
@@ -8,8 +8,8 @@
 using namespace saivs;
 
 MACsecIngressFilter::MACsecIngressFilter(
-    _In_ const std::string &macsec_interface_name) :
-    MACsecFilter(macsec_interface_name)
+    _In_ const std::string &macsecInterfaceName) :
+    MACsecFilter(macsecInterfaceName)
 {
     SWSS_LOG_ENTER();
 

diff --git a/vslib/src/TrafficFilterPipes.cpp b/vslib/src/TrafficFilterPipes.cpp
@@ -52,9 +52,7 @@ TrafficFilter::FilterStatus TrafficFilterPipes::execute(
 
         if (filter)
         {
-            ret = filter->execute(
-                buffer,
-                length);
+            ret = filter->execute(buffer, length);
 
             if (ret == TrafficFilter::CONTINUE)
             {
@@ -69,7 +67,6 @@ TrafficFilter::FilterStatus TrafficFilterPipes::execute(
         {
             itr = m_filters.erase(itr);
         }
-
     }
 
     return ret;