diff --git a/services/native/include/usb_right_db_helper.h b/services/native/include/usb_right_db_helper.h index ff2e05c08afee11dc3c13e918b90e8faf526d660..c3b01c90cb76ccd1db33129860f69e3163d3eea3 100644 --- a/services/native/include/usb_right_db_helper.h +++ b/services/native/include/usb_right_db_helper.h @@ -32,7 +32,7 @@ namespace USB { /* unit: second */ constexpr int64_t USB_RIGHT_VALID_PERIOD_MIN = 0; constexpr int64_t USB_RIGHT_VALID_PERIOD_MAX = 0xFFFFFFFFL; -constexpr int64_t USB_RIGHT_VALID_PERIOD_SET = 300; +constexpr uint64_t USB_RIGHT_VALID_PERIOD_SET = 300; struct UsbRightAppInfo { uint32_t primaryKeyId; /* table primary key */ @@ -103,7 +103,7 @@ public: /* delete (user) record */ int32_t DeleteUidRightRecord(int32_t uid); /* delete (user, time) expired record */ - int32_t DeleteNormalExpiredRightRecord(int32_t uid, long expiredTime); + int32_t DeleteNormalExpiredRightRecord(int32_t uid, uint64_t expiredTime); /* delete (validTime, device) record */ int32_t DeleteValidPeriodRightRecord(long validPeriod, const std::string &deviceName); diff --git a/services/native/include/usb_right_manager.h b/services/native/include/usb_right_manager.h index 5d030062f3348a24040478fa504d84830704777e..064c7bbcc88722339e0bcab4bc49fb8b006e4c0a 100644 --- a/services/native/include/usb_right_manager.h +++ b/services/native/include/usb_right_manager.h @@ -83,7 +83,7 @@ private: int32_t CleanUpRightAppUninstalled(int32_t uid, int32_t &totalApps, int32_t &deleteApps); int32_t CleanUpRightTemporaryExpired(const std::string &deviceName); int32_t CleanUpRightNormalExpired(int32_t uid); - int32_t CleanUpRightAppReinstalled(int32_t uid, int32_t &totalApps, int32_t &deleteApps); + int32_t CleanUpRightAppReinstalled(int32_t uid, uint32_t &totalApps, uint32_t &deleteApps); int32_t TidyUpRight(uint32_t choose); }; diff --git a/services/native/src/usb_right_db_helper.cpp b/services/native/src/usb_right_db_helper.cpp index a988893acd5ae28d974e964d791f2388cf345786..9169c45e7585e123478873f0fbbe3be91749d233 100644 --- a/services/native/src/usb_right_db_helper.cpp +++ b/services/native/src/usb_right_db_helper.cpp @@ -400,7 +400,7 @@ int32_t UsbRightDbHelper::DeleteUidRightRecord(int32_t uid) return ret; } -int32_t UsbRightDbHelper::DeleteNormalExpiredRightRecord(int32_t uid, long expiredTime) +int32_t UsbRightDbHelper::DeleteNormalExpiredRightRecord(int32_t uid, uint64_t expiredTime) { std::lock_guard guard(databaseMutex_); std::string whereClause = {"uid = ? AND requestTime < ? AND validPeriod NOT IN (?, ?)"}; @@ -408,8 +408,8 @@ int32_t UsbRightDbHelper::DeleteNormalExpiredRightRecord(int32_t uid, long expir std::to_string(USB_RIGHT_VALID_PERIOD_MIN), std::to_string(USB_RIGHT_VALID_PERIOD_MAX)}; int32_t ret = DeleteAndNoOtherOperation(whereClause, whereArgs); if (ret != USB_RIGHT_OK) { - USB_HILOGE( - MODULE_USB_SERVICE, "failed: delete(uid=%{public}d, expr<%{public}ld): %{public}d", uid, expiredTime, ret); + USB_HILOGE(MODULE_USB_SERVICE, + "failed: delete(uid=%{public}d, expr<%{public}" PRIu64 "): %{public}d", uid, expiredTime, ret); } return ret; } @@ -437,7 +437,7 @@ int32_t UsbRightDbHelper::GetResultSetTableInfo( USB_HILOGE(MODULE_USB_SERVICE, "get table info failed"); return USB_RIGHT_RDB_EXECUTE_FAILTURE; } - int32_t columnNamesCount = columnNames.size(); + int32_t columnNamesCount = static_cast(columnNames.size()); for (int32_t i = 0; i < columnNamesCount; i++) { std::string &columnName = columnNames.at(i); if (columnName == "id") { diff --git a/services/native/src/usb_right_manager.cpp b/services/native/src/usb_right_manager.cpp index fe6765c8f1f2cddc2e496051f7fcfb9acd2b84c4..19821023e39ae0f4b6b9ea6abe95748a861110bd 100644 --- a/services/native/src/usb_right_manager.cpp +++ b/services/native/src/usb_right_manager.cpp @@ -478,7 +478,7 @@ bool UsbRightManager::StringVectorFound( return false; } -int32_t UsbRightManager::CleanUpRightAppReinstalled(int32_t uid, int32_t &totalApps, int32_t &deleteApps) +int32_t UsbRightManager::CleanUpRightAppReinstalled(int32_t uid, uint32_t &totalApps, uint32_t &deleteApps) { std::vector apps; std::shared_ptr helper = UsbRightDbHelper::GetInstance(); @@ -570,7 +570,7 @@ int32_t UsbRightManager::CleanUpRightTemporaryExpired(const std::string &deviceN int32_t UsbRightManager::CleanUpRightNormalExpired(int32_t uid) { - int64_t nowTime = GetCurrentTimestamp(); + uint64_t nowTime = GetCurrentTimestamp(); std::shared_ptr helper = UsbRightDbHelper::GetInstance(); int32_t ret = helper->DeleteNormalExpiredRightRecord(uid, nowTime); if (ret != USB_RIGHT_OK) { @@ -615,10 +615,10 @@ int32_t UsbRightManager::TidyUpRight(uint32_t choose) USB_HILOGD(MODULE_USB_SERVICE, "delete expired record: %{public}d", ret); } if ((choose & TIGHT_UP_USB_RIGHT_RECORD_APP_REINSTALLED) != 0) { - int32_t totalReinstalledApps = 0; - int32_t deleteReinstalledApps = 0; + uint32_t totalReinstalledApps = 0; + uint32_t deleteReinstalledApps = 0; ret = CleanUpRightAppReinstalled(uid, totalReinstalledApps, deleteReinstalledApps); - USB_HILOGD(MODULE_USB_SERVICE, "delete app reinstalled record[%{public}d/%{public}d]: %{public}d", + USB_HILOGD(MODULE_USB_SERVICE, "delete app reinstalled record[%{public}u/%{public}u]: %{public}d", deleteReinstalledApps, totalReinstalledApps, ret); } return ret;