Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[syncd] ARM32 bit fixes, for 64bit printf format specifier. #643

Merged
merged 2 commits into from
Jul 21, 2020
Merged

[syncd] ARM32 bit fixes, for 64bit printf format specifier. #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9a20ff
[syncd] ARM32 bit fixes, for 64bit printf format specifier.
rajkumar38 Jul 21, 2020
c270499
[syncd] ARM32 bit fixes, for 64bit printf format specifier.
rajkumar38 Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions syncd/SingleReiniter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "meta/sai_serialize.h"

#include <unistd.h>
#include <inttypes.h>

using namespace syncd;
using namespace saimeta;
Expand Down Expand Up @@ -735,7 +736,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++)
{
Expand Down Expand Up @@ -965,7 +966,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);
}
Expand Down
3 changes: 2 additions & 1 deletion syncd/Syncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "meta/sai_serialize.h"

#include <unistd.h>
#include <inttypes.h>

#include <iterator>
#include <algorithm>
Expand Down Expand Up @@ -3063,7 +3064,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);
}

Expand Down