From f9a20fff21dc2ee03143c7915b4e3deb5205ff2c Mon Sep 17 00:00:00 2001 From: Rajkumar Pennadam Ramamoorthy Date: Tue, 21 Jul 2020 16:23:30 +0530 Subject: [PATCH 1/2] [syncd] ARM32 bit fixes, for 64bit printf format specifier. Signed-off-by: Rajkumar Pennadam Ramamoorthy --- meta/Meta.cpp | 4 ++-- syncd/SingleReiniter.cpp | 4 ++-- syncd/Syncd.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/Meta.cpp b/meta/Meta.cpp index 34e5b1b80..9a6c3dc64 100644 --- a/meta/Meta.cpp +++ b/meta/Meta.cpp @@ -4025,7 +4025,7 @@ sai_status_t Meta::meta_sai_validate_nat_entry( if (object_type == SAI_OBJECT_TYPE_NULL) { - SWSS_LOG_ERROR("virtual router oid 0x%lx is not valid object type, " + SWSS_LOG_ERROR("virtual router oid 0x%" PRIx64 " is not valid object type, " "returned null object type", vr); return SAI_STATUS_INVALID_PARAMETER; @@ -4035,7 +4035,7 @@ sai_status_t Meta::meta_sai_validate_nat_entry( if (object_type != expected) { - SWSS_LOG_ERROR("virtual router oid 0x%lx type %d is wrong type, " + SWSS_LOG_ERROR("virtual router oid 0x%" PRIx64 " type %d is wrong type, " "expected object type %d", vr, object_type, expected); return SAI_STATUS_INVALID_PARAMETER; diff --git a/syncd/SingleReiniter.cpp b/syncd/SingleReiniter.cpp index 7fe052082..e88937e56 100644 --- a/syncd/SingleReiniter.cpp +++ b/syncd/SingleReiniter.cpp @@ -735,7 +735,7 @@ sai_object_id_t SingleReiniter::processSingleVid( } else { - SWSS_LOG_DEBUG("setting attributes on object of type %x, processed VID 0x%lx to RID 0x%lx", objectType, vid, rid); + SWSS_LOG_DEBUG("setting attributes on object of type %x, processed VID 0x%" PRIx64 " to RID 0x%" PRIx64 " ", objectType, vid, rid); for (uint32_t idx = 0; idx < attrCount; idx++) { @@ -965,7 +965,7 @@ void SingleReiniter::processStructNonObjectIds( m->setoid(&meta_key, rid); - SWSS_LOG_DEBUG("processed vid 0x%lx to rid 0x%lx in %s:%s", vid, rid, + SWSS_LOG_DEBUG("processed vid 0x%" PRIx64 " to rid 0x%" PRIx64 " in %s:%s", vid, rid, info->objecttypename, m->membername); } diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp index 07ab90084..71ea17f6a 100644 --- a/syncd/Syncd.cpp +++ b/syncd/Syncd.cpp @@ -3063,7 +3063,7 @@ void Syncd::performWarmRestartSingleSwitch( if (originalSwitchRid != switchRid) { - SWSS_LOG_THROW("Unexpected RID 0x%lx (expected 0x%lx)", + SWSS_LOG_THROW("Unexpected RID 0x%" PRIx64 " (expected 0x%" PRIx64 " )", switchRid, originalSwitchRid); } From c27049958ca1ccf4d7ffa94e4f107e35b2bad612 Mon Sep 17 00:00:00 2001 From: Rajkumar Pennadam Ramamoorthy Date: Tue, 21 Jul 2020 16:23:30 +0530 Subject: [PATCH 2/2] [syncd] ARM32 bit fixes, for 64bit printf format specifier. Signed-off-by: Rajkumar Pennadam Ramamoorthy --- syncd/SingleReiniter.cpp | 1 + syncd/Syncd.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/syncd/SingleReiniter.cpp b/syncd/SingleReiniter.cpp index e88937e56..cadf2bdce 100644 --- a/syncd/SingleReiniter.cpp +++ b/syncd/SingleReiniter.cpp @@ -10,6 +10,7 @@ #include "meta/sai_serialize.h" #include +#include using namespace syncd; using namespace saimeta; diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp index 71ea17f6a..b56667d1a 100644 --- a/syncd/Syncd.cpp +++ b/syncd/Syncd.cpp @@ -19,6 +19,7 @@ #include "meta/sai_serialize.h" #include +#include #include #include