Remove white space endings (sonic-net#922)

Metaswitch · Sep 8, 2021 · f3bc342 · f3bc342
1 parent 1c4f04c
commit f3bc342
Show file tree

Hide file tree

Showing 25 changed files with 52 additions and 49 deletions.
diff --git a/lib/Switch.cpp b/lib/Switch.cpp
@@ -109,7 +109,7 @@ void Switch::updateNotifications(
                 break;
 
             case SAI_SWITCH_ATTR_BFD_SESSION_STATE_CHANGE_NOTIFY:
-                m_switchNotifications.on_bfd_session_state_change = 
+                m_switchNotifications.on_bfd_session_state_change =
                     (sai_bfd_session_state_change_notification_fn)attr.value.ptr;
                 break;
 

diff --git a/meta/Meta.h b/meta/Meta.h
@@ -188,7 +188,7 @@ namespace saimeta
 
             void meta_sai_on_bfd_session_state_change(
                     _In_ uint32_t count,
-                    _In_ const sai_bfd_session_state_notification_t *data);        
+                    _In_ const sai_bfd_session_state_notification_t *data);
 
         private: // notifications helpers
 

diff --git a/meta/SaiObject.cpp b/meta/SaiObject.cpp
@@ -11,7 +11,7 @@ SaiObject::SaiObject(
     m_metaKey(metaKey)
 {
     SWSS_LOG_ENTER();
- 
+
     if (!sai_metadata_is_object_type_valid(metaKey.objecttype))
     {
         SWSS_LOG_THROW("invalid object type: %d", metaKey.objecttype);

diff --git a/meta/sai_serialize.h b/meta/sai_serialize.h
@@ -412,7 +412,7 @@ void sai_deserialize_free_queue_deadlock_ntf(
 
 void sai_deserialize_free_bfd_session_state_ntf(
         _In_ uint32_t count,
-        _In_ sai_bfd_session_state_notification_t* bfdsessionstate);    
+        _In_ sai_bfd_session_state_notification_t* bfdsessionstate);
 
 void sai_deserialize_ingress_priority_group_attr(
         _In_ const std::string& s,

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
@@ -161,11 +161,11 @@ config_syncd_bcm()
       fi
 
     fi
-    
-    if [ -f "$HWSKU_DIR/context_config.json" ]; then 
+
+    if [ -f "$HWSKU_DIR/context_config.json" ]; then
         CMD_ARGS+=" -x $HWSKU_DIR/context_config.json -g 0"
     fi
-    
+
     [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0
     [ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0
     [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0

diff --git a/tests/checkwhitespace.sh b/tests/checkwhitespace.sh
@@ -2,7 +2,11 @@
 
 echo Checkig for white spaces ...
 
-find .. -type f | grep -v SAI/ |grep -f _wrap.cpp| perl -ne 'print if /\.(c|cpp|h|hpp|am|sh|pl|pm|install|dirs|links|json|ini|yml|pws|md|py|cfg|conf|i|ac)$/' | xargs grep -P "\\s\$"
+find .. -type f |
+grep -v SAI/ |
+grep -v _wrap.cpp |
+perl -ne 'print if /\.(c|cpp|h|hpp|am|sh|pl|pm|install|dirs|links|json|ini|yml|pws|md|py|cfg|conf|i|ac)$/' |
+xargs grep -P "\\s\$"
 
 if [ $? -eq 0 ]; then
     echo ERROR: some files contain white spaces at the end of line, please fix

diff --git a/tests/findcrossinclude.sh b/tests/findcrossinclude.sh
@@ -38,7 +38,7 @@ find ../meta/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|vslib/
 echo -- find cross include in lib directory
 
 find ../lib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "vslib/|syncd/"
-       
+
 echo -- find cross include in vslib directory
 
 find ../vslib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|syncd/"| \

diff --git a/unittest/lib/TestUtils.cpp b/unittest/lib/TestUtils.cpp
@@ -9,9 +9,9 @@ using namespace sairedis;
 TEST(Utils, clearOidValues)
 {
     sai_attribute_t attr;
-    
+
     sai_object_id_t oids[1];
-    
+
     attr.id = 1000;
 
     EXPECT_THROW(Utils::clearOidValues(SAI_OBJECT_TYPE_NULL, 1, &attr), std::runtime_error);
@@ -59,4 +59,3 @@ TEST(Utils, clearOidValues)
     EXPECT_EQ(oids[0], 0);
 
 }
-
diff --git a/unittest/lib/main.cpp b/unittest/lib/main.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-class SwsscommonEnvironment: 
+class SwsscommonEnvironment:
     public ::testing::Environment
 {
     public:

diff --git a/unittest/lib/main_libsairedis.cpp b/unittest/lib/main_libsairedis.cpp
@@ -76,12 +76,12 @@ static sai_service_method_table_t test_services = {
     profile_get_next_value
 };
 
-class sairedisEnvironment: 
+class sairedisEnvironment:
     public ::testing::Environment
 {
     public:
 
-        virtual void SetUp() override 
+        virtual void SetUp() override
         {
             SWSS_LOG_ENTER();
 
@@ -91,7 +91,7 @@ class sairedisEnvironment:
 
             EXPECT_EQ(status, SAI_STATUS_SUCCESS);
         }
-        
+
         virtual void TearDown() override
         {
             SWSS_LOG_ENTER();

diff --git a/unittest/lib/test_sai_redis_hostif.cpp b/unittest/lib/test_sai_redis_hostif.cpp
@@ -30,7 +30,7 @@ TEST(libsairedis, hostif)
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_hostif_trap_group(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_hostif_trap_group_attribute(0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->get_hostif_trap_group_attribute(0,0,0));
-    
+
     EXPECT_NE(SAI_STATUS_SUCCESS, api->create_hostif_trap(&id,0,0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_hostif_trap(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_hostif_trap_attribute(0,0));

diff --git a/unittest/meta/TestLegacy.cpp b/unittest/meta/TestLegacy.cpp
@@ -52,7 +52,7 @@ namespace TestLegacy
         auto status = g_meta->remove(SAI_OBJECT_TYPE_SWITCH, switchId);
 
         EXPECT_EQ(SAI_STATUS_SUCCESS, status);
-        
+
         if (g_meta->isEmpty() == false)
         {
             g_meta->dump();

diff --git a/unittest/meta/TestNotificationFactory.cpp b/unittest/meta/TestNotificationFactory.cpp
@@ -67,7 +67,7 @@ TEST(NotificationFactory, deserialize_switch_state_change)
     auto str = sai_serialize_switch_oper_status(0x2100000000, status);
 
     // {"status":"SAI_SWITCH_OPER_STATUS_UP","switch_id":"oid:0x2100000000"}
- 
+
     auto ntf = NotificationFactory::deserialize(
             SAI_SWITCH_NOTIFICATION_NAME_SWITCH_STATE_CHANGE,
             str);

diff --git a/unittest/meta/TestNotificationFdbEvent.cpp b/unittest/meta/TestNotificationFdbEvent.cpp
@@ -12,12 +12,12 @@
 using namespace sairedis;
 using namespace saimeta;
 
-static std::string s = 
+static std::string s =
 "[{\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x260000000005be\\\",\\\"mac\\\":\\\"52:54:00:86:DD:7A\\\",\\\"switch_id\\\":\\\"oid:0x21000000000000\\\"}\","
 "\"fdb_event\":\"SAI_FDB_EVENT_LEARNED\","
 "\"list\":[{\"id\":\"SAI_FDB_ENTRY_ATTR_TYPE\",\"value\":\"SAI_FDB_ENTRY_TYPE_DYNAMIC\"},{\"id\":\"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID\",\"value\":\"oid:0x3a000000000660\"}]}]";
 
-static std::string null = 
+static std::string null =
 "[{\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x260000000005be\\\",\\\"mac\\\":\\\"52:54:00:86:DD:7A\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
 "\"fdb_event\":\"SAI_FDB_EVENT_LEARNED\","
 "\"list\":[{\"id\":\"SAI_FDB_ENTRY_ATTR_TYPE\",\"value\":\"SAI_FDB_ENTRY_TYPE_DYNAMIC\"},{\"id\":\"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID\",\"value\":\"oid:0x3a000000000660\"}]}]";

diff --git a/unittest/meta/TestSaiSerialize.cpp b/unittest/meta/TestSaiSerialize.cpp
@@ -585,7 +585,7 @@ TEST(SaiSerialize, serialize_chardata)
     EXPECT_THROW(sai_deserialize_attr_value("\\x2g", *meta, attr), std::runtime_error);
 
     EXPECT_THROW(sai_deserialize_attr_value("\\x2", *meta, attr), std::runtime_error);
-        
+
     EXPECT_THROW(sai_deserialize_attr_value("\\s45", *meta, attr), std::runtime_error);
 
     EXPECT_THROW(sai_deserialize_attr_value("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", *meta, attr), std::runtime_error);
@@ -626,7 +626,7 @@ TEST(SaiSerialize, serialize_uint64)
     EXPECT_EQ(12345, attr.value.u64);
 
     EXPECT_THROW(sai_deserialize_attr_value("22345235345345345435", *meta, attr), std::runtime_error);
-        
+
     EXPECT_THROW(sai_deserialize_attr_value("2a", *meta, attr), std::runtime_error);
 }
 

diff --git a/unittest/meta/main.cpp b/unittest/meta/main.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-class SwsscommonEnvironment: 
+class SwsscommonEnvironment:
     public ::testing::Environment
 {
     public:

diff --git a/unittest/syncd/Makefile.am b/unittest/syncd/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/syncd -I$(top_srcdir)/lib -I$(top_srcdir)/vslib 
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/syncd -I$(top_srcdir)/lib -I$(top_srcdir)/vslib
 
 bin_PROGRAMS = tests
 

diff --git a/unittest/vslib/TestFdbInfo.cpp b/unittest/vslib/TestFdbInfo.cpp
@@ -59,7 +59,7 @@ TEST(FdbInfo, serialize)
 
 TEST(FdbInfo, deserialize)
 {
-    std::string str = 
+    std::string str =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:00\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
@@ -124,14 +124,14 @@ TEST(FdbInfo, setTimestamp)
 
 TEST(FdbInfo, operator_bracket)
 {
-    std::string strA = 
+    std::string strA =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:00\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
             "\"timestamp\":\"0\","
             "\"vlan_id\":\"0\"}";
 
-    std::string strB = 
+    std::string strB =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:01\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
@@ -147,14 +147,14 @@ TEST(FdbInfo, operator_bracket)
 
 TEST(FdbInfo, operator_lt)
 {
-    std::string strA = 
+    std::string strA =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:00\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
             "\"timestamp\":\"0\","
             "\"vlan_id\":\"0\"}";
 
-    std::string strB = 
+    std::string strB =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:01\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
@@ -169,14 +169,14 @@ TEST(FdbInfo, operator_lt)
     EXPECT_EQ(a < a, false);
     EXPECT_EQ(b < b, false);
 
-    std::string strC = 
+    std::string strC =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:00\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","
             "\"timestamp\":\"0\","
             "\"vlan_id\":\"1\"}";
 
-    std::string strD = 
+    std::string strD =
             "{\"bridge_port_id\":\"oid:0x1\","
             "\"fdb_entry\":\"{\\\"bvid\\\":\\\"oid:0x0\\\",\\\"mac\\\":\\\"00:00:00:00:00:00\\\",\\\"switch_id\\\":\\\"oid:0x0\\\"}\","
             "\"port_id\":\"oid:0x0\","

diff --git a/unittest/vslib/TestSwitchBCM56850.cpp b/unittest/vslib/TestSwitchBCM56850.cpp
@@ -37,7 +37,7 @@ TEST(SwitchBCM56850, ctr)
             nullptr);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -67,7 +67,7 @@ TEST(SwitchBCM56850, refresh_bridge_port_list)
             sc);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -92,7 +92,7 @@ TEST(SwitchBCM56850, refresh_bridge_port_list)
     attr.value.objlist.list = list;
 
     EXPECT_EQ(sw.get(SAI_OBJECT_TYPE_BRIDGE, sboid, 1, &attr), SAI_STATUS_SUCCESS);
-    
+
     //std::cout << sw.dump_switch_database_for_warm_restart();
 }
 
@@ -242,7 +242,7 @@ TEST(SwitchBCM56850, warm_update_queues)
             warmBootState);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 

diff --git a/unittest/vslib/TestSwitchBCM81724.cpp b/unittest/vslib/TestSwitchBCM81724.cpp
@@ -37,7 +37,7 @@ TEST(SwitchBCM81724, ctr)
             nullptr);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -71,7 +71,7 @@ TEST(SwitchBCM81724, refresh_read_only)
             sc);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -98,7 +98,7 @@ TEST(SwitchBCM81724, refresh_read_only)
     attrs[1].value.u32 = 10000;
 
     sai_object_id_t portId = mgr->allocateNewObjectId(SAI_OBJECT_TYPE_PORT, switchId);
-    
+
     auto strPortId = sai_serialize_object_id(portId);
 
     EXPECT_EQ(sw.create(SAI_OBJECT_TYPE_PORT, strPortId, switchId, 2, attrs), SAI_STATUS_SUCCESS);

diff --git a/unittest/vslib/TestSwitchMLNX2700.cpp b/unittest/vslib/TestSwitchMLNX2700.cpp
@@ -37,7 +37,7 @@ TEST(SwitchMLNX2700, ctr)
             nullptr);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -67,7 +67,7 @@ TEST(SwitchMLNX2700, refresh_bridge_port_list)
             sc);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 
@@ -241,7 +241,7 @@ TEST(SwitchMLNX2700, warm_update_queues)
             warmBootState);
 
     sai_attribute_t attr;
-    
+
     attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
     attr.value.booldata = true;
 

diff --git a/unittest/vslib/TestTrafficForwarder.cpp b/unittest/vslib/TestTrafficForwarder.cpp
@@ -47,7 +47,7 @@ TEST(TrafficForwarder, addVlanTag)
     struct tpacket_auxdata* aux = (struct tpacket_auxdata*)CMSG_DATA(cmsg);
 
     // https://en.wikipedia.org/wiki/IEEE_802.1Q
-    // 
+    //
     // TPID(16) |          TCI(16)
     //          |  PCP(3)  DEI(1) VID(12)
 
@@ -62,5 +62,5 @@ TEST(TrafficForwarder, addVlanTag)
 
     EXPECT_TRUE(TrafficForwarder::addVlanTag(buffer, length, hdr));
 
-    EXPECT_EQ(length, 68); 
+    EXPECT_EQ(length, 68);
 }
diff --git a/unittest/vslib/main_libsaivs.cpp b/unittest/vslib/main_libsaivs.cpp
@@ -76,12 +76,12 @@ static sai_service_method_table_t test_services = {
     profile_get_next_value
 };
 
-class VirtualSwitchEnvironment: 
+class VirtualSwitchEnvironment:
     public ::testing::Environment
 {
     public:
 
-        virtual void SetUp() override 
+        virtual void SetUp() override
         {
             SWSS_LOG_ENTER();
 
@@ -93,7 +93,7 @@ class VirtualSwitchEnvironment:
 
             EXPECT_EQ(status, SAI_STATUS_SUCCESS);
         }
-        
+
         virtual void TearDown() override
         {
             SWSS_LOG_ENTER();

diff --git a/unittest/vslib/test_sai_vs_hostif.cpp b/unittest/vslib/test_sai_vs_hostif.cpp
@@ -30,7 +30,7 @@ TEST(libsaivs, hostif)
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_hostif_trap_group(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_hostif_trap_group_attribute(0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->get_hostif_trap_group_attribute(0,0,0));
-    
+
     EXPECT_NE(SAI_STATUS_SUCCESS, api->create_hostif_trap(&id,0,0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_hostif_trap(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_hostif_trap_attribute(0,0));