From 310e871b13e61668d374ae9235575dcddd28e23c Mon Sep 17 00:00:00 2001
From: "g00536918 (GeorgeT)" <george.timoshenko@huawei.com>
Date: Thu, 9 Jan 2025 10:25:56 +0800
Subject: [PATCH] cjapi: contacts: fixup signed/unsigned warnings

Change-Id: I97aabd39b7f2383cb95dc43b755621f2cfe5ec09
Signed-off-by: gtimoshenko <george.timoshenko@huawei.com>
---
 contactsCJ/include/contacts_utils.h |  4 ++--
 contactsCJ/src/contacts_ffi.cpp     |  4 ++--
 contactsCJ/src/contacts_utils.cpp   | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contactsCJ/include/contacts_utils.h b/contactsCJ/include/contacts_utils.h
index 14e2464..d311014 100644
--- a/contactsCJ/include/contacts_utils.h
+++ b/contactsCJ/include/contacts_utils.h
@@ -96,7 +96,7 @@ struct Buckets {
     void freeContent()
     {
         if (data != nullptr) {
-            for (int b = 0; b < bucketCount; b++) {
+            for (uint64_t b = 0; b < bucketCount; b++) {
                 ValuesBucket bucket = data[b];
                 bucket.freeContent();
             }
@@ -118,7 +118,7 @@ struct ContactsData {
     void freeContent()
     {
         if (contactsData != nullptr) {
-            for (int i = 0; i < contactsCount; i++) {
+            for (uint64_t i = 0; i < contactsCount; i++) {
                 ContactData contactData = contactsData[i];
                 contactData.freeContent();
             }
diff --git a/contactsCJ/src/contacts_ffi.cpp b/contactsCJ/src/contacts_ffi.cpp
index 25b7db0..bcf537c 100644
--- a/contactsCJ/src/contacts_ffi.cpp
+++ b/contactsCJ/src/contacts_ffi.cpp
@@ -30,7 +30,7 @@ extern "C" {
     {
         DataShare::DataShareValuesBucket convertedRawContact = convertToDataShareVB(rawContact[0]);
         std::vector<DataShare::DataShareValuesBucket> convertedContact;
-        for (int64_t i = 0; i < contactData->bucketCount; i++) {
+        for (uint64_t i = 0; i < contactData->bucketCount; i++) {
             ContactsFfi::ValuesBucket vb = contactData->data[i];
             convertedContact.push_back(convertToDataShareVB(vb));
         }
@@ -46,7 +46,7 @@ extern "C" {
                                      int64_t predicatesId, int32_t *errCode)
     {
         std::vector<DataShare::DataShareValuesBucket> convertedContact;
-        for (int64_t i = 0; i < contactData->bucketCount; i++) {
+        for (uint64_t i = 0; i < contactData->bucketCount; i++) {
             ContactsFfi::ValuesBucket vb = contactData->data[i];
             convertedContact.push_back(convertToDataShareVB(vb));
         }
diff --git a/contactsCJ/src/contacts_utils.cpp b/contactsCJ/src/contacts_utils.cpp
index 8014ac7..cd3653f 100644
--- a/contactsCJ/src/contacts_utils.cpp
+++ b/contactsCJ/src/contacts_utils.cpp
@@ -49,9 +49,9 @@ bool allocBucket(ValuesBucket* b, size_t total, int32_t *errCode)
 
 DataShareValuesBucket convertToDataShareVB(ValuesBucket vb)
 {
-    int64_t size = vb.size;
+    uint64_t size = vb.size;
     DataShareValuesBucket dsvb = DataShareValuesBucket();
-    for (int64_t i = 0; i < size; i++) {
+    for (uint64_t i = 0; i < size; i++) {
         switch (vb.value[i].tag) {
             case DataShareValueObjectType::TYPE_STRING: {
                 DataShareValueObject valueObject = DataShareValueObject(std::string(vb.value[i].string));
@@ -620,7 +620,7 @@ GroupsData* parseResultSetForGroups(std::shared_ptr<DataShareResultSet> &resultS
     int totalGroups = 0;
     resultSet->GetRowCount(totalGroups);
     HILOG_INFO("parseResultSetForGroups GetRowCount is %{public}d", totalGroups);
-    if (totalGroups == 0) {
+    if (totalGroups <= 0) {
         return nullptr;
     }
 
@@ -637,7 +637,7 @@ GroupsData* parseResultSetForGroups(std::shared_ptr<DataShareResultSet> &resultS
         *errCode = ERROR;
         return NULL;
     }
-    allGroups->bucketCount = totalGroups;
+    allGroups->bucketCount = static_cast<uint64_t>(totalGroups);
 
     int resultSetNum = resultSet->GoToFirstRow();
     int count = 0;
@@ -670,7 +670,7 @@ HoldersData* parseResultSetForHolders(std::shared_ptr<DataShareResultSet> &resul
     int totalHolders = 0;
     resultSet->GetRowCount(totalHolders);
     HILOG_INFO("parseResultSetForHolders GetRowCount is %{public}d", totalHolders);
-    if (totalHolders == 0) {
+    if (totalHolders <= 0) {
         return nullptr;
     }
 
@@ -687,7 +687,7 @@ HoldersData* parseResultSetForHolders(std::shared_ptr<DataShareResultSet> &resul
         *errCode = ERROR;
         return nullptr;
     }
-    allHolders->bucketCount = totalHolders;
+    allHolders->bucketCount = static_cast<uint64_t>(totalHolders);
 
     int resultSetNum = resultSet->GoToFirstRow();
     int count = 0;
-- 
Gitee