Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 709a5fc

Browse files
committed
Address -Wsign-compare and -Wvarargs warnings.
1 parent d10316e commit 709a5fc

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/lib/profiles/data-management/Legacy/ProfileDatabase.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
429429
const uint64_t &aTag,
430430
uint32_t aProfileId,
431431
const uint64_t &aInstanceId,
432-
uint16_t aPathLen,
432+
uint32_t aPathLen,
433433
...)
434434
{
435435
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -451,7 +451,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
451451

452452
va_start(pathTags, aPathLen);
453453

454-
for (int i = 0; i < aPathLen; i++)
454+
for (uint32_t i = 0; i < aPathLen; i++)
455455
{
456456
err = aWriter.PutNull(va_arg(pathTags, uint64_t));
457457

@@ -517,7 +517,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
517517
uint32_t aProfileId,
518518
const uint32_t aInstanceIdLen,
519519
const uint8_t *aInstanceId,
520-
uint16_t aPathLen,
520+
uint32_t aPathLen,
521521
...)
522522
{
523523
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -539,7 +539,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
539539

540540
va_start(pathTags, aPathLen);
541541

542-
for (int i = 0; i < aPathLen; i++)
542+
for (uint32_t i = 0; i < aPathLen; i++)
543543
{
544544
err = aWriter.PutNull(va_arg(pathTags, uint64_t));
545545

@@ -598,7 +598,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
598598
const uint64_t &aTag,
599599
uint32_t aProfileId,
600600
const char *aInstanceId,
601-
uint16_t aPathLen,
601+
uint32_t aPathLen,
602602
...)
603603
{
604604
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -620,7 +620,7 @@ WEAVE_ERROR EncodePath(TLVWriter &aWriter,
620620

621621
va_start(pathTags, aPathLen);
622622

623-
for (int i = 0; i < aPathLen; i++)
623+
for (uint32_t i = 0; i < aPathLen; i++)
624624
{
625625
err = aWriter.PutNull(va_arg(pathTags, uint64_t));
626626

@@ -679,7 +679,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
679679
const uint64_t &aTag,
680680
uint32_t aProfileId,
681681
const uint64_t &aInstanceId,
682-
uint16_t aPathLen,
682+
uint32_t aPathLen,
683683
...)
684684
{
685685
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -709,7 +709,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
709709

710710
va_start(pathTags, aPathLen);
711711

712-
for (int i = 0; i < aPathLen; i++)
712+
for (uint32_t i = 0; i < aPathLen; i++)
713713
{
714714
err = aWriter.PutNull(va_arg(pathTags, uint64_t));
715715

@@ -768,7 +768,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
768768
const uint64_t &aTag,
769769
uint32_t aProfileId,
770770
const char *aInstanceId,
771-
uint16_t aPathLen,
771+
uint32_t aPathLen,
772772
...)
773773
{
774774
WEAVE_ERROR err = WEAVE_NO_ERROR;
@@ -798,7 +798,7 @@ WEAVE_ERROR EncodeDeprecatedPath(TLVWriter &aWriter,
798798

799799
va_start(pathTags, aPathLen);
800800

801-
for (int i = 0; i < aPathLen; i++)
801+
for (uint32_t i = 0; i < aPathLen; i++)
802802
{
803803
err = aWriter.PutNull(va_arg(pathTags, uint64_t));
804804

src/lib/profiles/data-management/Legacy/ProfileDatabase.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,22 +386,22 @@ namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNames
386386
const uint64_t &aTag,
387387
uint32_t aProfileId,
388388
const uint64_t &aInstanceId,
389-
uint16_t aPathLen,
389+
uint32_t aPathLen,
390390
...);
391391

392392
WEAVE_ERROR EncodePath(nl::Weave::TLV::TLVWriter &aWriter,
393393
const uint64_t &aTag,
394394
uint32_t aProfileId,
395395
const uint32_t aInstanceIdLen,
396396
const uint8_t *aInstanceId,
397-
uint16_t aPathLen,
397+
uint32_t aPathLen,
398398
...);
399399

400400
WEAVE_ERROR EncodePath(nl::Weave::TLV::TLVWriter &aWriter,
401401
const uint64_t &aTag,
402402
uint32_t aProfileId,
403403
const char *aInstanceId,
404-
uint16_t aPathLen,
404+
uint32_t aPathLen,
405405
...);
406406

407407
/*
@@ -414,14 +414,14 @@ namespace WeaveMakeManagedNamespaceIdentifier(DataManagement, kWeaveManagedNames
414414
const uint64_t &aTag,
415415
uint32_t aProfileId,
416416
const uint64_t &aInstanceId,
417-
uint16_t aPathLen,
417+
uint32_t aPathLen,
418418
...);
419419

420420
WEAVE_ERROR EncodeDeprecatedPath(nl::Weave::TLV::TLVWriter &aWriter,
421421
const uint64_t &aTag,
422422
uint32_t aProfileId,
423423
const char *aInstanceId,
424-
uint16_t aPathLen,
424+
uint32_t aPathLen,
425425
...);
426426

427427
/**

0 commit comments

Comments
 (0)