From: hyunho Date: Tue, 4 Jun 2019 04:53:02 +0000 (+0900) Subject: Change the type of uid value int to uid_t X-Git-Tag: submit/tizen/20190627.022129~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=caa461377dba2ba0dc39cd4322ae51aaa06e979b;p=platform%2Fcore%2Fapi%2Fnotification.git Change the type of uid value int to uid_t Change-Id: If6b5591d6c38e9eb4b9ba6e6ddf5a9be197ef1be Signed-off-by: hyunho --- diff --git a/notification-ex/abstract_item_implementation.h b/notification-ex/abstract_item_implementation.h index af62938f..b02ab873 100644 --- a/notification-ex/abstract_item_implementation.h +++ b/notification-ex/abstract_item_implementation.h @@ -62,7 +62,7 @@ class AbstractItem::Impl { std::list hide_viewer_list_; std::string tag_; time_t time_ = 0; - int uid_ = 0; + uid_t uid_ = 0; int request_id_ = 0; }; diff --git a/notification-ex/db_manager.cc b/notification-ex/db_manager.cc index fc3b38a4..34ceedb4 100644 --- a/notification-ex/db_manager.cc +++ b/notification-ex/db_manager.cc @@ -251,7 +251,8 @@ void DBManager::CheckLimit(shared_ptr addedItem, sqlite3* db char* query; sqlite3_stmt* stmt = nullptr; sqlite3_stmt* delete_stmt = nullptr; - int uid = static_pointer_cast(addedItem->GetInfo())->GetUid(); + uid_t uid = + static_pointer_cast(addedItem->GetInfo())->GetUid(); ret = GetCount(addedItem->GetSenderAppId(), uid, &count); if (ret != ERROR_NONE || count <= NOTI_LIMIT) @@ -332,7 +333,8 @@ int DBManager::UpdateReceiverList (shared_ptr updatedItem, sqlite3* db) { int ret; char* query; - int uid = static_pointer_cast(updatedItem->GetInfo())->GetUid(); + uid_t uid = + static_pointer_cast(updatedItem->GetInfo())->GetUid(); query = sqlite3_mprintf("DELETE FROM receiver_list" " WHERE root_id = %Q AND app_id = %Q AND uid = %d", @@ -388,7 +390,7 @@ int DBManager::InsertNotification(list> addedItem } for (auto& i : addedItem) { - int uid = static_pointer_cast(i->GetInfo())->GetUid(); + uid_t uid = static_pointer_cast(i->GetInfo())->GetUid(); ret = GetCount(i->GetId(), i->GetSenderAppId(), uid, &count); if (ret != ERROR_NONE) break; @@ -486,12 +488,12 @@ map DBManager::GetHideMap() { return hide_map; } -int DBManager::GetCount(const string& app_id, int uid, int* count) { +int DBManager::GetCount(const string& app_id, uid_t uid, int* count) { return GetCount(string(), app_id, uid, count); } int DBManager::GetCount(const string& root_id, const string& app_id, - int uid, int* count) { + uid_t uid, int* count) { int ret; char* query; sqlite3_stmt *stmt; @@ -560,9 +562,11 @@ int DBManager::UpdateHideList(shared_ptr updatedItem, int DBManager::UpdateNotification(shared_ptr updatedItem) { int count, ret; char* query; - int uid = static_pointer_cast(updatedItem->GetInfo())->GetUid(); + uid_t uid = + static_pointer_cast(updatedItem->GetInfo())->GetUid(); - ret = GetCount(updatedItem->GetId(), updatedItem->GetSenderAppId(), uid, &count); + ret = GetCount( + updatedItem->GetId(), updatedItem->GetSenderAppId(), uid, &count); if (ret != ERROR_NONE) { LOGE("fail to get count"); return ret; @@ -661,7 +665,8 @@ list> DBManager::ExecuteGetList(char* query) { return item_list; } -list> DBManager::GetNotificationList(string app_id, int uid) { +list> DBManager::GetNotificationList( + string app_id, uid_t uid) { char* query; list> item_list; @@ -680,7 +685,7 @@ list> DBManager::GetNotificationList(string app_i } list> DBManager::GetNotificationList - (string app_id, string root_id, int uid) { + (string app_id, string root_id, uid_t uid) { char* query; list> item_list; @@ -699,7 +704,7 @@ list> DBManager::GetNotificationList return item_list; } -list> DBManager::GetNotificationList(int uid) { +list> DBManager::GetNotificationList(uid_t uid) { int ret, sim_mode; char* query; list> item_list; @@ -734,7 +739,8 @@ list> DBManager::GetNotificationList(int uid) { int DBManager::DeleteNotification(shared_ptr deletedItem) { int ret; char* query; - int uid = static_pointer_cast(deletedItem->GetInfo())->GetUid(); + uid_t uid = + static_pointer_cast(deletedItem->GetInfo())->GetUid(); query = sqlite3_mprintf("DELETE FROM noti_ex_list" " WHERE root_id = %Q AND app_id = %Q AND uid = %d", @@ -765,7 +771,7 @@ int DBManager::DeleteNotification(shared_ptr deletedItem) { return ret; } -string DBManager::GetPkgId(const string& app_id, int uid) { +string DBManager::GetPkgId(const string& app_id, uid_t uid) { pkgmgrinfo_pkginfo_h handle; char *buf = nullptr; string pkgid; diff --git a/notification-ex/db_manager.h b/notification-ex/db_manager.h index 23f63463..cf687e1e 100644 --- a/notification-ex/db_manager.h +++ b/notification-ex/db_manager.h @@ -40,12 +40,12 @@ class EXPORT_API DBManager { static std::map GetHideMap(); static int UpdateHideList(std::shared_ptr updatedItem, const std::string& hide_list); static int UpdateNotification(std::shared_ptr updatedItem); - static int GetCount(const std::string& root_id, const std::string& app_id, int uid, int* count); - static int GetCount(const std::string& app_id, int uid, int* count); + static int GetCount(const std::string& root_id, const std::string& app_id, uid_t uid, int* count); + static int GetCount(const std::string& app_id, uid_t uid, int* count); static int DeleteNotification(std::shared_ptr deletedItem); - static std::list> GetNotificationList(int uid); - static std::list> GetNotificationList(std::string app_id, int uid); - static std::list> GetNotificationList(std::string app_id, std::string root_id, int uid); + static std::list> GetNotificationList(uid_t uid); + static std::list> GetNotificationList(std::string app_id, uid_t uid); + static std::list> GetNotificationList(std::string app_id, std::string root_id, uid_t uid); private: DBManager(); /* LCOV_EXCL_LINE */ @@ -56,7 +56,7 @@ class EXPORT_API DBManager { static int RecoverCorruptedDB(sqlite3* db); static int ExecuteQuery(const char* query, int* num_changes); static int ExecuteQuery(sqlite3* db, const char* query, int* num_changes); - static std::string GetPkgId(const std::string& app_id, int uid); + static std::string GetPkgId(const std::string& app_id, uid_t uid); static void CheckLimit(std::shared_ptr addedItem, sqlite3* db); static int UpdateReceiverList(std::shared_ptr updatedItem, sqlite3* db); static std::list> ExecuteGetList(char* query); diff --git a/notification-ex/iitem_info_internal.h b/notification-ex/iitem_info_internal.h index 57059bff..f2dd10d1 100644 --- a/notification-ex/iitem_info_internal.h +++ b/notification-ex/iitem_info_internal.h @@ -29,8 +29,8 @@ namespace item { class EXPORT_API IItemInfoInternal : public IItemInfo { public: virtual ~IItemInfoInternal() = default; - virtual int GetUid() const = 0; - virtual void SetUid(int uid) = 0; + virtual uid_t GetUid() const = 0; + virtual void SetUid(uid_t uid) = 0; virtual int GetVersion() const = 0; virtual void SetVersion(int ver) = 0; virtual void AddHideViewer(std::string appid) = 0; diff --git a/notification-ex/item_info.cc b/notification-ex/item_info.cc index 36f3cfaf..1c88e0b7 100644 --- a/notification-ex/item_info.cc +++ b/notification-ex/item_info.cc @@ -34,11 +34,12 @@ namespace item { AbstractItem::Impl::ItemInfo::ItemInfo(AbstractItem::Impl* impl) : impl_(impl) { } -int AbstractItem::Impl::ItemInfo::GetUid() const { + +uid_t AbstractItem::Impl::ItemInfo::GetUid() const { return impl_->uid_; } -void AbstractItem::Impl::ItemInfo::SetUid(int uid) { +void AbstractItem::Impl::ItemInfo::SetUid(uid_t uid) { impl_->uid_ = uid; } diff --git a/notification-ex/item_info_internal.h b/notification-ex/item_info_internal.h index dc10c724..90df3584 100644 --- a/notification-ex/item_info_internal.h +++ b/notification-ex/item_info_internal.h @@ -27,8 +27,8 @@ class AbstractItem::Impl::ItemInfo : public IItemInfoInternal { public: ItemInfo(AbstractItem::Impl* impl); virtual ~ItemInfo() = default; - int GetUid() const override; - void SetUid(int uid) override; + uid_t GetUid() const override; + void SetUid(uid_t uid) override; time_t GetTime() const override; void SetTime(time_t time) override; int GetVersion() const override;