[syncd] Use correct VID when GET will fail to obrain object type (#577)

sonic-net · Mar 17, 2020 · 54b2510 · 54b2510
1 parent 59b0430
commit 54b2510
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/src/VirtualObjectIdManager.cpp b/lib/src/VirtualObjectIdManager.cpp
@@ -146,7 +146,7 @@ sai_object_type_t VirtualObjectIdManager::saiObjectTypeQuery(
 
     if (objectType == SAI_OBJECT_TYPE_NULL || objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
-        SWSS_LOG_ERROR("invalid object id 0x%s",
+        SWSS_LOG_ERROR("invalid object id %s",
                 sai_serialize_object_id(objectId).c_str());
 
         /*
@@ -359,7 +359,7 @@ sai_object_type_t VirtualObjectIdManager::objectTypeQuery(
 
     if (!sai_metadata_is_object_type_valid(objectType))
     {
-        SWSS_LOG_ERROR("invalid object id 0x%s",
+        SWSS_LOG_ERROR("invalid object id %s",
                 sai_serialize_object_id(objectId).c_str());
 
         return SAI_OBJECT_TYPE_NULL;

diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp
@@ -742,7 +742,7 @@ sai_status_t Syncd::processBulkEntry(
 }
 
 sai_status_t Syncd::processEntry(
-        _In_ sai_object_meta_key_t &metaKey,
+        _In_ sai_object_meta_key_t metaKey,
         _In_ sai_common_api_t api,
         _In_ uint32_t attr_count,
         _In_ sai_attribute_t *attr_list)

diff --git a/syncd/Syncd.h b/syncd/Syncd.h
@@ -211,7 +211,7 @@ namespace syncd
         public: // TODO to private
 
             sai_status_t processEntry(
-                    _In_ sai_object_meta_key_t &meta_key,
+                    _In_ sai_object_meta_key_t meta_key,
                     _In_ sai_common_api_t api,
                     _In_ uint32_t attr_count,
                     _In_ sai_attribute_t *attr_list);

diff --git a/vslib/src/RealObjectIdManager.cpp b/vslib/src/RealObjectIdManager.cpp
@@ -143,7 +143,7 @@ sai_object_type_t RealObjectIdManager::saiObjectTypeQuery(
 
     if (objectType == SAI_OBJECT_TYPE_NULL || objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
-        SWSS_LOG_ERROR("invalid object id 0x%s",
+        SWSS_LOG_ERROR("invalid object id %s",
                 sai_serialize_object_id(objectId).c_str());
 
         /*
@@ -357,7 +357,7 @@ sai_object_type_t RealObjectIdManager::objectTypeQuery(
 
     if (!sai_metadata_is_object_type_valid(objectType))
     {
-        SWSS_LOG_ERROR("invalid object id 0x%s",
+        SWSS_LOG_ERROR("invalid object id %s",
                 sai_serialize_object_id(objectId).c_str());
 
         return SAI_OBJECT_TYPE_NULL;