Fixing compilation issue in 32-bit arch (marvell-armhf) (#1280)

Sabareesh-Kumar-Anandan · web-flow · commit 69a980e1c7eb · 2020-05-27T02:23:11.000-07:00
Replaced %l variants with PRI.
Replaced %lu with %zu for size_t

Signed-off-by: Sabareesh Kumar Anandan &lt;sanandan@marvell.com&gt;
diff --git a/cfgmgr/natmgr.cpp b/cfgmgr/natmgr.cpp
@@ -5049,7 +5049,7 @@ void NatMgr::doStaticNatTask(Consumer &consumer)
         /* Ensure the key size is 1 otherwise ignore */
         if (keys.size() != STATIC_NAT_KEY_SIZE)
         {
-            SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -5366,7 +5366,7 @@ void NatMgr::doStaticNaptTask(Consumer &consumer)
         /* Ensure the key size is 3 otherwise ignore */
         if (keys.size() != STATIC_NAPT_KEY_SIZE)
         {   
-            SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -5707,7 +5707,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)
         /* Ensure the key size is 1 otherwise ignore */
         if (keys.size() != POOL_TABLE_KEY_SIZE)
         {
-            SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -5766,7 +5766,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)
             /* Ensure the Pool name length is not more than 32 otherwise ignore */
             if (key.length() > 32)
             {
-                SWSS_LOG_ERROR("Invalid pool name length - %lu, skipping %s", key.length(), key.c_str());
+                SWSS_LOG_ERROR("Invalid pool name length - %zu, skipping %s", key.length(), key.c_str());
                 it = consumer.m_toSync.erase(it);
                 continue;
             }
@@ -5791,7 +5791,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)
             /* Ensure the ip range size is not more than 2, otherwise ignore */
             if (nat_ip_range.size() > 2)
             {
-                SWSS_LOG_ERROR("Invalid nat ip range size %lu, skipping %s", nat_ip_range.size(), key.c_str());
+                SWSS_LOG_ERROR("Invalid nat ip range size %zu, skipping %s", nat_ip_range.size(), key.c_str());
                 it = consumer.m_toSync.erase(it);
                 continue;
             }
@@ -5876,7 +5876,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)
                 /* Ensure the port range size is not more than 2, otherwise ignore */
                 if (nat_port_range.size() > 2)
                 {
-                    SWSS_LOG_ERROR("Invalid nat port range size %lu, skipping %s", nat_port_range.size(), key.c_str());
+                    SWSS_LOG_ERROR("Invalid nat port range size %zu, skipping %s", nat_port_range.size(), key.c_str());
                     it = consumer.m_toSync.erase(it);
                     continue;
                 }
@@ -6094,15 +6094,15 @@ void NatMgr::doNatBindingTask(Consumer &consumer)
         /* Ensure the key size is 1 otherwise ignore */
         if (keys.size() != BINDING_TABLE_KEY_SIZE)
         {
-            SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
 
         /* Ensure the Binding name length is not more than 32 otherwise ignore */
         if (key.length() > 32)
         {
-            SWSS_LOG_ERROR("Invalid binding name length - %lu, skipping %s", key.length(), key.c_str());
+            SWSS_LOG_ERROR("Invalid binding name length - %zu, skipping %s", key.length(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -6226,7 +6226,7 @@ void NatMgr::doNatBindingTask(Consumer &consumer)
             /* Ensure the Pool name length is not more than 32 otherwise ignore */
             if (nat_pool.length() > 32)
             {
-                SWSS_LOG_ERROR("Invalid pool name length - %lu, skipping %s", nat_pool.length(), key.c_str());
+                SWSS_LOG_ERROR("Invalid pool name length - %zu, skipping %s", nat_pool.length(), key.c_str());
                 it = consumer.m_toSync.erase(it);
                 continue;
             }
@@ -6604,13 +6604,13 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)
         /* Ensure the key size is 2 or 1, otherwise ignore */
         if ((keys.size() != L3_INTERFACE_KEY_SIZE) and (keys.size() != L3_INTERFACE_ZONE_SIZE))
         {
-            SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
         else
         {
-            SWSS_LOG_INFO("Key size %lu for %s", keys.size(), key.c_str());
+            SWSS_LOG_INFO("Key size %zu for %s", keys.size(), key.c_str());
         }
 
         /* Ensure the key starts with "Vlan" or "Ethernet" or "PortChannel" or "Loopback", otherwise ignore */
@@ -6849,7 +6849,7 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)
             }
             else
             {
-                SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+                SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             }
             it = consumer.m_toSync.erase(it);
         }
@@ -6935,7 +6935,7 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)
             }
             else
             {
-                SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+                SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             }
             it = consumer.m_toSync.erase(it);
         }
@@ -6971,7 +6971,7 @@ void NatMgr::doNatAclTableTask(Consumer &consumer)
         /* Ensure the key size is 1 otherwise ignore */
         if (keys.size() != ACL_TABLE_KEY_SIZE)
         {
-            SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -7112,7 +7112,7 @@ void NatMgr::doNatAclRuleTask(Consumer &consumer)
         /* Ensure the key size is 2 otherwise ignore */
         if (keys.size() != ACL_RULE_TABLE_KEY_SIZE)
         {
-            SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());
+            SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());
             it = consumer.m_toSync.erase(it);
             continue;
         }
@@ -7239,7 +7239,7 @@ void NatMgr::doNatAclRuleTask(Consumer &consumer)
                     /* Ensure the port range size is valid, otherwise ignore */
                     if (port_range.size() != L4_PORT_RANGE_SIZE)
                     {
-                        SWSS_LOG_INFO("Invalid port range size %lu for Matching Port Range Field, skipping %s", port_range.size(), key.c_str());
+                        SWSS_LOG_INFO("Invalid port range size %zu for Matching Port Range Field, skipping %s", port_range.size(), key.c_str());
                         isNatAclRuleNotValid = true;
                         break;
                     }
diff --git a/orchagent/natorch.cpp b/orchagent/natorch.cpp
@@ -3312,7 +3312,7 @@ bool NatOrch::getNatCounters(const NatEntry::iterator &iter)
     {
         if (status != SAI_STATUS_SUCCESS)
         {
-            SWSS_LOG_ERROR("Failed to get Counters for SNAT entry [src-ip %s], bytes = %lu, pkts = %lu", ipAddr.to_string().c_str(),
+            SWSS_LOG_ERROR("Failed to get Counters for SNAT entry [src-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "", ipAddr.to_string().c_str(),
                            nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
         }
         else
@@ -3325,7 +3325,7 @@ bool NatOrch::getNatCounters(const NatEntry::iterator &iter)
     {
         if (status != SAI_STATUS_SUCCESS)
         {
-            SWSS_LOG_ERROR("Failed to get Counters for DNAT entry [dst-ip %s], bytes = %lu, pkts = %lu", ipAddr.to_string().c_str(),
+            SWSS_LOG_ERROR("Failed to get Counters for DNAT entry [dst-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "", ipAddr.to_string().c_str(),
                            nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
         }
         else
@@ -3376,7 +3376,7 @@ bool NatOrch::getTwiceNatCounters(const TwiceNatEntry::iterator &iter)
     status = sai_nat_api->get_nat_entry_attribute(&dbl_nat_entry, attr_count, nat_entry_attr);
     if (status != SAI_STATUS_SUCCESS)
     {
-        SWSS_LOG_ERROR("Failed to get Counters for Twice NAT entry [src-ip %s, dst-ip %s], bytes = %lu, pkts = %lu",
+        SWSS_LOG_ERROR("Failed to get Counters for Twice NAT entry [src-ip %s, dst-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "",
                         key.src_ip.to_string().c_str(), key.dst_ip.to_string().c_str(),
                         nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
     }
@@ -3521,7 +3521,7 @@ bool NatOrch::getNaptCounters(const NaptEntry::iterator &iter)
     { 
         if (status != SAI_STATUS_SUCCESS)
         {
-            SWSS_LOG_ERROR("Failed to get Counters for SNAPT entry for [proto %s, src-ip %s, src-port %d], bytes = %lu, pkts = %lu",
+            SWSS_LOG_ERROR("Failed to get Counters for SNAPT entry for [proto %s, src-ip %s, src-port %d], bytes = %" PRIu64 ", pkts = %" PRIu64 "",
                            naptKey.prototype.c_str(), naptKey.ip_address.to_string().c_str(), naptKey.l4_port,
                            nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
         }
@@ -3535,7 +3535,7 @@ bool NatOrch::getNaptCounters(const NaptEntry::iterator &iter)
     {
         if (status != SAI_STATUS_SUCCESS)
         {
-            SWSS_LOG_ERROR("Failed to get Counters for DNAPT entry for [proto %s, dst-ip %s, dst-port %d], bytes = %lu, pkts = %lu",
+            SWSS_LOG_ERROR("Failed to get Counters for DNAPT entry for [proto %s, dst-ip %s, dst-port %d], bytes = %" PRIu64 ", pkts = %" PRIu64 "",
                            naptKey.prototype.c_str(), naptKey.ip_address.to_string().c_str(), naptKey.l4_port,
                            nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
         }
@@ -4732,7 +4732,7 @@ void NatOrch::debugdumpALL()
         SWSS_DEBUG_PRINT(m_dbgCompName, "%8d.  IP: %s", count, ipAddr.to_string().c_str());
         SWSS_DEBUG_PRINT(m_dbgCompName, "             Translated IP: %s, NAT Type: %s, Entry Type: %s",
                          value.translated_ip.to_string().c_str(), value.nat_type.c_str(), value.entry_type.c_str());
-        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %ld secs, Added-to-Hw: %s",
+        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %" PRId64 " secs, Added-to-Hw: %s",
                          (value.ageOutTime - time_now.tv_sec), ((value.addedToHw) ? "Yes" : "No"));
         natIter++;
     }
@@ -4751,7 +4751,7 @@ void NatOrch::debugdumpALL()
         SWSS_DEBUG_PRINT(m_dbgCompName, "             Translated IP: %s, L4 Port: %d, NAT Type: %s, Entry Type: %s",
                          naptValue.translated_ip.to_string().c_str(), naptValue.translated_l4_port,
                          naptValue.nat_type.c_str(), naptValue.entry_type.c_str());
-        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %ld secs, Added-to-Hw: %s",
+        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %" PRId64 " secs, Added-to-Hw: %s",
                          (naptValue.ageOutTime - time_now.tv_sec), ((naptValue.addedToHw) ? "Yes" : "No"));
         naptIter++;
     }
@@ -4771,7 +4771,7 @@ void NatOrch::debugdumpALL()
         SWSS_DEBUG_PRINT(m_dbgCompName, "             Translated Src IP: %s, Dst IP: %s, Entry Type: %s",
                          twiceNatValue.translated_src_ip.to_string().c_str(), twiceNatValue.translated_dst_ip.to_string().c_str(),
                          twiceNatValue.entry_type.c_str());
-        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %ld secs, Added-to-Hw: %s",
+        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %" PRId64 " secs, Added-to-Hw: %s",
                          (twiceNatValue.ageOutTime - time_now.tv_sec), ((twiceNatValue.addedToHw) ? "Yes" : "No"));
         twiceNatIter++;
     }
@@ -4793,7 +4793,7 @@ void NatOrch::debugdumpALL()
                          twiceNaptValue.translated_src_ip.to_string().c_str(), twiceNaptValue.translated_src_l4_port,
                          twiceNaptValue.translated_dst_ip.to_string().c_str(), twiceNaptValue.translated_dst_l4_port,
                          twiceNaptValue.entry_type.c_str());
-        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %ld secs, Added-to-Hw: %s",
+        SWSS_DEBUG_PRINT(m_dbgCompName, "             Age-out time: %" PRId64 " secs, Added-to-Hw: %s",
                          (twiceNaptValue.ageOutTime - time_now.tv_sec), ((twiceNaptValue.addedToHw) ? "Yes" : "No"));
         twiceNaptIter++;
     }
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
@@ -1773,7 +1773,7 @@ void PortsOrch::removePortFromPortListMap(sai_object_id_t port_id)
     {
         if (it->second == port_id)
         {
-            SWSS_LOG_NOTICE("Removing port-id %lx from port list map", port_id);
+            SWSS_LOG_NOTICE("Removing port-id %" PRIx64 " from port list map", port_id);
             it = m_portListLaneMap.erase(it);
             break;
         }
@@ -2276,15 +2276,15 @@ void PortsOrch::doPortTask(Consumer &consumer)
                 // port is part of at-least one VLAN. 
                 // Ideally this should be tracked by SAI redis. 
                 // Until then, let this snippet be here.
-                SWSS_LOG_WARN("Cannot remove port as bridge port OID is present %lx", bridge_port_oid);
+                SWSS_LOG_WARN("Cannot remove port as bridge port OID is present %" PRIx64 , bridge_port_oid);
                 it++;
                 continue;
             } 
 
             if (m_portList[alias].m_init)
             {
                 deInitPort(alias, port_id);
-                SWSS_LOG_NOTICE("Removing hostif %lx for Port %s", hif_id, alias.c_str());
+                SWSS_LOG_NOTICE("Removing hostif %" PRIx64 " for Port %s", hif_id, alias.c_str());
                 sai_status_t status = sai_hostif_api->remove_hostif(hif_id);
                 if (status != SAI_STATUS_SUCCESS)
                 {

Original file line number	Diff line number	Diff line change
`@@ -5049,7 +5049,7 @@ void NatMgr::doStaticNatTask(Consumer &consumer)`
`5049`	`5049`	`/* Ensure the key size is 1 otherwise ignore */`
`5050`	`5050`	`if (keys.size() != STATIC_NAT_KEY_SIZE)`
`5051`	`5051`	`{`
`5052`		`- SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`5052`	`+ SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`5053`	`5053`	`it = consumer.m_toSync.erase(it);`
`5054`	`5054`	`continue;`
`5055`	`5055`	`}`
`@@ -5366,7 +5366,7 @@ void NatMgr::doStaticNaptTask(Consumer &consumer)`
`5366`	`5366`	`/* Ensure the key size is 3 otherwise ignore */`
`5367`	`5367`	`if (keys.size() != STATIC_NAPT_KEY_SIZE)`
`5368`	`5368`	`{`
`5369`		`- SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`5369`	`+ SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`5370`	`5370`	`it = consumer.m_toSync.erase(it);`
`5371`	`5371`	`continue;`
`5372`	`5372`	`}`
`@@ -5707,7 +5707,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)`
`5707`	`5707`	`/* Ensure the key size is 1 otherwise ignore */`
`5708`	`5708`	`if (keys.size() != POOL_TABLE_KEY_SIZE)`
`5709`	`5709`	`{`
`5710`		`- SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`5710`	`+ SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`5711`	`5711`	`it = consumer.m_toSync.erase(it);`
`5712`	`5712`	`continue;`
`5713`	`5713`	`}`
`@@ -5766,7 +5766,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)`
`5766`	`5766`	`/* Ensure the Pool name length is not more than 32 otherwise ignore */`
`5767`	`5767`	`if (key.length() > 32)`
`5768`	`5768`	`{`
`5769`		`- SWSS_LOG_ERROR("Invalid pool name length - %lu, skipping %s", key.length(), key.c_str());`
	`5769`	`+ SWSS_LOG_ERROR("Invalid pool name length - %zu, skipping %s", key.length(), key.c_str());`
`5770`	`5770`	`it = consumer.m_toSync.erase(it);`
`5771`	`5771`	`continue;`
`5772`	`5772`	`}`
`@@ -5791,7 +5791,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)`
`5791`	`5791`	`/* Ensure the ip range size is not more than 2, otherwise ignore */`
`5792`	`5792`	`if (nat_ip_range.size() > 2)`
`5793`	`5793`	`{`
`5794`		`- SWSS_LOG_ERROR("Invalid nat ip range size %lu, skipping %s", nat_ip_range.size(), key.c_str());`
	`5794`	`+ SWSS_LOG_ERROR("Invalid nat ip range size %zu, skipping %s", nat_ip_range.size(), key.c_str());`
`5795`	`5795`	`it = consumer.m_toSync.erase(it);`
`5796`	`5796`	`continue;`
`5797`	`5797`	`}`
`@@ -5876,7 +5876,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)`
`5876`	`5876`	`/* Ensure the port range size is not more than 2, otherwise ignore */`
`5877`	`5877`	`if (nat_port_range.size() > 2)`
`5878`	`5878`	`{`
`5879`		`- SWSS_LOG_ERROR("Invalid nat port range size %lu, skipping %s", nat_port_range.size(), key.c_str());`
	`5879`	`+ SWSS_LOG_ERROR("Invalid nat port range size %zu, skipping %s", nat_port_range.size(), key.c_str());`
`5880`	`5880`	`it = consumer.m_toSync.erase(it);`
`5881`	`5881`	`continue;`
`5882`	`5882`	`}`
`@@ -6094,15 +6094,15 @@ void NatMgr::doNatBindingTask(Consumer &consumer)`
`6094`	`6094`	`/* Ensure the key size is 1 otherwise ignore */`
`6095`	`6095`	`if (keys.size() != BINDING_TABLE_KEY_SIZE)`
`6096`	`6096`	`{`
`6097`		`- SWSS_LOG_ERROR("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`6097`	`+ SWSS_LOG_ERROR("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`6098`	`6098`	`it = consumer.m_toSync.erase(it);`
`6099`	`6099`	`continue;`
`6100`	`6100`	`}`
`6101`	`6101`
`6102`	`6102`	`/* Ensure the Binding name length is not more than 32 otherwise ignore */`
`6103`	`6103`	`if (key.length() > 32)`
`6104`	`6104`	`{`
`6105`		`- SWSS_LOG_ERROR("Invalid binding name length - %lu, skipping %s", key.length(), key.c_str());`
	`6105`	`+ SWSS_LOG_ERROR("Invalid binding name length - %zu, skipping %s", key.length(), key.c_str());`
`6106`	`6106`	`it = consumer.m_toSync.erase(it);`
`6107`	`6107`	`continue;`
`6108`	`6108`	`}`
`@@ -6226,7 +6226,7 @@ void NatMgr::doNatBindingTask(Consumer &consumer)`
`6226`	`6226`	`/* Ensure the Pool name length is not more than 32 otherwise ignore */`
`6227`	`6227`	`if (nat_pool.length() > 32)`
`6228`	`6228`	`{`
`6229`		`- SWSS_LOG_ERROR("Invalid pool name length - %lu, skipping %s", nat_pool.length(), key.c_str());`
	`6229`	`+ SWSS_LOG_ERROR("Invalid pool name length - %zu, skipping %s", nat_pool.length(), key.c_str());`
`6230`	`6230`	`it = consumer.m_toSync.erase(it);`
`6231`	`6231`	`continue;`
`6232`	`6232`	`}`
`@@ -6604,13 +6604,13 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)`
`6604`	`6604`	`/* Ensure the key size is 2 or 1, otherwise ignore */`
`6605`	`6605`	`if ((keys.size() != L3_INTERFACE_KEY_SIZE) and (keys.size() != L3_INTERFACE_ZONE_SIZE))`
`6606`	`6606`	`{`
`6607`		`- SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`6607`	`+ SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`6608`	`6608`	`it = consumer.m_toSync.erase(it);`
`6609`	`6609`	`continue;`
`6610`	`6610`	`}`
`6611`	`6611`	`else`
`6612`	`6612`	`{`
`6613`		`- SWSS_LOG_INFO("Key size %lu for %s", keys.size(), key.c_str());`
	`6613`	`+ SWSS_LOG_INFO("Key size %zu for %s", keys.size(), key.c_str());`
`6614`	`6614`	`}`
`6615`	`6615`
`6616`	`6616`	`/* Ensure the key starts with "Vlan" or "Ethernet" or "PortChannel" or "Loopback", otherwise ignore */`
`@@ -6849,7 +6849,7 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)`
`6849`	`6849`	`}`
`6850`	`6850`	`else`
`6851`	`6851`	`{`
`6852`		`- SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`6852`	`+ SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`6853`	`6853`	`}`
`6854`	`6854`	`it = consumer.m_toSync.erase(it);`
`6855`	`6855`	`}`
`@@ -6935,7 +6935,7 @@ void NatMgr::doNatIpInterfaceTask(Consumer &consumer)`
`6935`	`6935`	`}`
`6936`	`6936`	`else`
`6937`	`6937`	`{`
`6938`		`- SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`6938`	`+ SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`6939`	`6939`	`}`
`6940`	`6940`	`it = consumer.m_toSync.erase(it);`
`6941`	`6941`	`}`
`@@ -6971,7 +6971,7 @@ void NatMgr::doNatAclTableTask(Consumer &consumer)`
`6971`	`6971`	`/* Ensure the key size is 1 otherwise ignore */`
`6972`	`6972`	`if (keys.size() != ACL_TABLE_KEY_SIZE)`
`6973`	`6973`	`{`
`6974`		`- SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`6974`	`+ SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`6975`	`6975`	`it = consumer.m_toSync.erase(it);`
`6976`	`6976`	`continue;`
`6977`	`6977`	`}`
`@@ -7112,7 +7112,7 @@ void NatMgr::doNatAclRuleTask(Consumer &consumer)`
`7112`	`7112`	`/* Ensure the key size is 2 otherwise ignore */`
`7113`	`7113`	`if (keys.size() != ACL_RULE_TABLE_KEY_SIZE)`
`7114`	`7114`	`{`
`7115`		`- SWSS_LOG_INFO("Invalid key size %lu, skipping %s", keys.size(), key.c_str());`
	`7115`	`+ SWSS_LOG_INFO("Invalid key size %zu, skipping %s", keys.size(), key.c_str());`
`7116`	`7116`	`it = consumer.m_toSync.erase(it);`
`7117`	`7117`	`continue;`
`7118`	`7118`	`}`
`@@ -7239,7 +7239,7 @@ void NatMgr::doNatAclRuleTask(Consumer &consumer)`
`7239`	`7239`	`/* Ensure the port range size is valid, otherwise ignore */`
`7240`	`7240`	`if (port_range.size() != L4_PORT_RANGE_SIZE)`
`7241`	`7241`	`{`
`7242`		`- SWSS_LOG_INFO("Invalid port range size %lu for Matching Port Range Field, skipping %s", port_range.size(), key.c_str());`
	`7242`	`+ SWSS_LOG_INFO("Invalid port range size %zu for Matching Port Range Field, skipping %s", port_range.size(), key.c_str());`
`7243`	`7243`	`isNatAclRuleNotValid = true;`
`7244`	`7244`	`break;`
`7245`	`7245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3312,7 +3312,7 @@ bool NatOrch::getNatCounters(const NatEntry::iterator &iter)`
`3312`	`3312`	`{`
`3313`	`3313`	`if (status != SAI_STATUS_SUCCESS)`
`3314`	`3314`	`{`
`3315`		`- SWSS_LOG_ERROR("Failed to get Counters for SNAT entry [src-ip %s], bytes = %lu, pkts = %lu", ipAddr.to_string().c_str(),`
	`3315`	`+ SWSS_LOG_ERROR("Failed to get Counters for SNAT entry [src-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "", ipAddr.to_string().c_str(),`
`3316`	`3316`	`nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);`
`3317`	`3317`	`}`
`3318`	`3318`	`else`
`@@ -3325,7 +3325,7 @@ bool NatOrch::getNatCounters(const NatEntry::iterator &iter)`
`3325`	`3325`	`{`
`3326`	`3326`	`if (status != SAI_STATUS_SUCCESS)`
`3327`	`3327`	`{`
`3328`		`- SWSS_LOG_ERROR("Failed to get Counters for DNAT entry [dst-ip %s], bytes = %lu, pkts = %lu", ipAddr.to_string().c_str(),`
	`3328`	`+ SWSS_LOG_ERROR("Failed to get Counters for DNAT entry [dst-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "", ipAddr.to_string().c_str(),`
`3329`	`3329`	`nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);`
`3330`	`3330`	`}`
`3331`	`3331`	`else`
`@@ -3376,7 +3376,7 @@ bool NatOrch::getTwiceNatCounters(const TwiceNatEntry::iterator &iter)`
`3376`	`3376`	`status = sai_nat_api->get_nat_entry_attribute(&dbl_nat_entry, attr_count, nat_entry_attr);`
`3377`	`3377`	`if (status != SAI_STATUS_SUCCESS)`
`3378`	`3378`	`{`
`3379`		`- SWSS_LOG_ERROR("Failed to get Counters for Twice NAT entry [src-ip %s, dst-ip %s], bytes = %lu, pkts = %lu",`
	`3379`	`+ SWSS_LOG_ERROR("Failed to get Counters for Twice NAT entry [src-ip %s, dst-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "",`
`3380`	`3380`	`key.src_ip.to_string().c_str(), key.dst_ip.to_string().c_str(),`
`3381`	`3381`	`nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);`
`3382`	`3382`	`}`
`@@ -3521,7 +3521,7 @@ bool NatOrch::getNaptCounters(const NaptEntry::iterator &iter)`
`3521`	`3521`	`{`
`3522`	`3522`	`if (status != SAI_STATUS_SUCCESS)`
`3523`	`3523`	`{`
`3524`		`- SWSS_LOG_ERROR("Failed to get Counters for SNAPT entry for [proto %s, src-ip %s, src-port %d], bytes = %lu, pkts = %lu",`
	`3524`	`+ SWSS_LOG_ERROR("Failed to get Counters for SNAPT entry for [proto %s, src-ip %s, src-port %d], bytes = %" PRIu64 ", pkts = %" PRIu64 "",`
`3525`	`3525`	`naptKey.prototype.c_str(), naptKey.ip_address.to_string().c_str(), naptKey.l4_port,`
`3526`	`3526`	`nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);`
`3527`	`3527`	`}`
`@@ -3535,7 +3535,7 @@ bool NatOrch::getNaptCounters(const NaptEntry::iterator &iter)`
`3535`	`3535`	`{`
`3536`	`3536`	`if (status != SAI_STATUS_SUCCESS)`
`3537`	`3537`	`{`
`3538`		`- SWSS_LOG_ERROR("Failed to get Counters for DNAPT entry for [proto %s, dst-ip %s, dst-port %d], bytes = %lu, pkts = %lu",`
	`3538`	`+ SWSS_LOG_ERROR("Failed to get Counters for DNAPT entry for [proto %s, dst-ip %s, dst-port %d], bytes = %" PRIu64 ", pkts = %" PRIu64 "",`
`3539`	`3539`	`naptKey.prototype.c_str(), naptKey.ip_address.to_string().c_str(), naptKey.l4_port,`
`3540`	`3540`	`nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);`
`3541`	`3541`	`}`
`@@ -4732,7 +4732,7 @@ void NatOrch::debugdumpALL()`
`4732`	`4732`	`SWSS_DEBUG_PRINT(m_dbgCompName, "%8d. IP: %s", count, ipAddr.to_string().c_str());`
`4733`	`4733`	`SWSS_DEBUG_PRINT(m_dbgCompName, " Translated IP: %s, NAT Type: %s, Entry Type: %s",`
`4734`	`4734`	`value.translated_ip.to_string().c_str(), value.nat_type.c_str(), value.entry_type.c_str());`
`4735`		`- SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %ld secs, Added-to-Hw: %s",`
	`4735`	`+ SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %" PRId64 " secs, Added-to-Hw: %s",`
`4736`	`4736`	`(value.ageOutTime - time_now.tv_sec), ((value.addedToHw) ? "Yes" : "No"));`
`4737`	`4737`	`natIter++;`
`4738`	`4738`	`}`
`@@ -4751,7 +4751,7 @@ void NatOrch::debugdumpALL()`
`4751`	`4751`	`SWSS_DEBUG_PRINT(m_dbgCompName, " Translated IP: %s, L4 Port: %d, NAT Type: %s, Entry Type: %s",`
`4752`	`4752`	`naptValue.translated_ip.to_string().c_str(), naptValue.translated_l4_port,`
`4753`	`4753`	`naptValue.nat_type.c_str(), naptValue.entry_type.c_str());`
`4754`		`- SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %ld secs, Added-to-Hw: %s",`
	`4754`	`+ SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %" PRId64 " secs, Added-to-Hw: %s",`
`4755`	`4755`	`(naptValue.ageOutTime - time_now.tv_sec), ((naptValue.addedToHw) ? "Yes" : "No"));`
`4756`	`4756`	`naptIter++;`
`4757`	`4757`	`}`
`@@ -4771,7 +4771,7 @@ void NatOrch::debugdumpALL()`
`4771`	`4771`	`SWSS_DEBUG_PRINT(m_dbgCompName, " Translated Src IP: %s, Dst IP: %s, Entry Type: %s",`
`4772`	`4772`	`twiceNatValue.translated_src_ip.to_string().c_str(), twiceNatValue.translated_dst_ip.to_string().c_str(),`
`4773`	`4773`	`twiceNatValue.entry_type.c_str());`
`4774`		`- SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %ld secs, Added-to-Hw: %s",`
	`4774`	`+ SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %" PRId64 " secs, Added-to-Hw: %s",`
`4775`	`4775`	`(twiceNatValue.ageOutTime - time_now.tv_sec), ((twiceNatValue.addedToHw) ? "Yes" : "No"));`
`4776`	`4776`	`twiceNatIter++;`
`4777`	`4777`	`}`
`@@ -4793,7 +4793,7 @@ void NatOrch::debugdumpALL()`
`4793`	`4793`	`twiceNaptValue.translated_src_ip.to_string().c_str(), twiceNaptValue.translated_src_l4_port,`
`4794`	`4794`	`twiceNaptValue.translated_dst_ip.to_string().c_str(), twiceNaptValue.translated_dst_l4_port,`
`4795`	`4795`	`twiceNaptValue.entry_type.c_str());`
`4796`		`- SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %ld secs, Added-to-Hw: %s",`
	`4796`	`+ SWSS_DEBUG_PRINT(m_dbgCompName, " Age-out time: %" PRId64 " secs, Added-to-Hw: %s",`
`4797`	`4797`	`(twiceNaptValue.ageOutTime - time_now.tv_sec), ((twiceNaptValue.addedToHw) ? "Yes" : "No"));`
`4798`	`4798`	`twiceNaptIter++;`
`4799`	`4799`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1773,7 +1773,7 @@ void PortsOrch::removePortFromPortListMap(sai_object_id_t port_id)`
`1773`	`1773`	`{`
`1774`	`1774`	`if (it->second == port_id)`
`1775`	`1775`	`{`
`1776`		`- SWSS_LOG_NOTICE("Removing port-id %lx from port list map", port_id);`
	`1776`	`+ SWSS_LOG_NOTICE("Removing port-id %" PRIx64 " from port list map", port_id);`
`1777`	`1777`	`it = m_portListLaneMap.erase(it);`
`1778`	`1778`	`break;`
`1779`	`1779`	`}`
`@@ -2276,15 +2276,15 @@ void PortsOrch::doPortTask(Consumer &consumer)`
`2276`	`2276`	`// port is part of at-least one VLAN.`
`2277`	`2277`	`// Ideally this should be tracked by SAI redis.`
`2278`	`2278`	`// Until then, let this snippet be here.`
`2279`		`- SWSS_LOG_WARN("Cannot remove port as bridge port OID is present %lx", bridge_port_oid);`
	`2279`	`+ SWSS_LOG_WARN("Cannot remove port as bridge port OID is present %" PRIx64 , bridge_port_oid);`
`2280`	`2280`	`it++;`
`2281`	`2281`	`continue;`
`2282`	`2282`	`}`
`2283`	`2283`
`2284`	`2284`	`if (m_portList[alias].m_init)`
`2285`	`2285`	`{`
`2286`	`2286`	`deInitPort(alias, port_id);`
`2287`		`- SWSS_LOG_NOTICE("Removing hostif %lx for Port %s", hif_id, alias.c_str());`
	`2287`	`+ SWSS_LOG_NOTICE("Removing hostif %" PRIx64 " for Port %s", hif_id, alias.c_str());`
`2288`	`2288`	`sai_status_t status = sai_hostif_api->remove_hostif(hif_id);`
`2289`	`2289`	`if (status != SAI_STATUS_SUCCESS)`
`2290`	`2290`	`{`