From c6b93ffc13e037418175cec878023c7d24ad82e1 Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Mon, 30 Jun 2014 13:24:04 +0200 Subject: [PATCH] Change return type from bool to void for some methods of PrivilegeDb Methods GetPkgPermissions, AddApplication, RemoveApplication and UpdatePermissions had return type set to void. But they didn't return anything useful. The actual return value was always true or exception throw. Changing the types to void will also make usage of these methods simpler. Change-Id: Id588c314c6aa1af0ea3c17ed02d0f6bf20411193 Signed-off-by: Rafal Krypa --- src/server/db/include/privilege_db.h | 18 +++++++----------- src/server/db/privilege_db.cpp | 34 ++++++++-------------------------- 2 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/server/db/include/privilege_db.h b/src/server/db/include/privilege_db.h index 94f41f7..02e3d0b 100644 --- a/src/server/db/include/privilege_db.h +++ b/src/server/db/include/privilege_db.h @@ -22,6 +22,7 @@ /* * @file privilege_db.h * @author Krzysztof Sasiak + * @author Rafal Krypa * @version 1.0 * @brief This file contains declaration of the API to privilges database. */ @@ -83,9 +84,8 @@ private: * @param pkgId - package identifier * @param[out] currentPermissions - list of current permissions assigned to tuple (appId, pkgId) * @exception DB::SqlConnection::Exception::InternalError on internal error - * @return true on success, false on failure */ - bool GetPkgPermissions(const std::string &pkgId, + void GetPkgPermissions(const std::string &pkgId, TPermissionsList ¤tPermission); public: @@ -133,9 +133,8 @@ public: * @param pkgId - package identifier * @param[out] pkgIdIsNew - return info if pkgId is new to the database * @exception DB::SqlConnection::Exception::InternalError on internal error - * @return true on success, false on failure */ - bool AddApplication(const std::string &appId, const std::string &pkgId, + void AddApplication(const std::string &appId, const std::string &pkgId, bool &pkgIdIsNew); /** @@ -145,9 +144,8 @@ public: * @param pkgId - package identifier * @param[out] pkgIdIsNoMore - return info if pkgId is in the database * @exception DB::SqlConnection::Exception::InternalError on internal error - * @return true on success, false on failure */ - bool RemoveApplication(const std::string &appId, const std::string &pkgId, + void RemoveApplication(const std::string &appId, const std::string &pkgId, bool &pkgIdIsNoMore); /** @@ -159,16 +157,14 @@ public: * @param[out] addedPermissions - return list of added permissions * @param[out] removedPermissions - return list of removed permissions * @exception DB::SqlConnection::Exception::InternalError on internal error - * @return - true on success, false on failure */ - bool UpdatePermissions(const std::string &appId, + void UpdatePermissions(const std::string &appId, const std::string &pkgId, const TPermissionsList &permissions, TPermissionsList &addedPermissions, TPermissionsList &removedPermissions); }; -} -; -//namespace SecurityManager + +} //namespace SecurityManager #endif // PRIVILEGE_DB_H_ diff --git a/src/server/db/privilege_db.cpp b/src/server/db/privilege_db.cpp index ed6c38e..0f50460 100644 --- a/src/server/db/privilege_db.cpp +++ b/src/server/db/privilege_db.cpp @@ -108,7 +108,7 @@ bool PrivilegeDb::PkgIdExists(const std::string &pkgId) return false; } -bool PrivilegeDb::AddApplication(const std::string &appId, +void PrivilegeDb::AddApplication(const std::string &appId, const std::string &pkgId, bool &pkgIdIsNew) { pkgIdIsNew = !(this->PkgIdExists(pkgId)); @@ -129,14 +129,10 @@ bool PrivilegeDb::AddApplication(const std::string &appId, command->Reset(); LogPedantic( "Added appId: " << appId << ", pkgId: " << pkgId); - return true; - }CATCH_STANDARD_EXCEPTIONS; - return false; - } -bool PrivilegeDb::RemoveApplication(const std::string &appId, +void PrivilegeDb::RemoveApplication(const std::string &appId, const std::string &pkgId, bool &pkgIdIsNoMore) { try { @@ -157,14 +153,10 @@ bool PrivilegeDb::RemoveApplication(const std::string &appId, pkgIdIsNoMore = !(this->PkgIdExists(pkgId)); - return true; - }CATCH_STANDARD_EXCEPTIONS; - return false; - } -bool PrivilegeDb::GetPkgPermissions(const std::string &pkgId, +void PrivilegeDb::GetPkgPermissions(const std::string &pkgId, TPermissionsList ¤tPermissions) { try { @@ -179,25 +171,19 @@ bool PrivilegeDb::GetPkgPermissions(const std::string &pkgId, currentPermissions.push_back(permission); }; - return true; }CATCH_STANDARD_EXCEPTIONS; - - return false; - } -bool PrivilegeDb::UpdatePermissions(const std::string &appId, +void PrivilegeDb::UpdatePermissions(const std::string &appId, const std::string &pkgId, const TPermissionsList &permissions, TPermissionsList &addedPermissions, TPermissionsList &removedPermissions) { - DB::SqlConnection::DataCommandAutoPtr command; - - TPermissionsList curPermissions = TPermissionsList(); - if (!this->GetPkgPermissions(pkgId, curPermissions)) - return false; - try { + DB::SqlConnection::DataCommandAutoPtr command; + TPermissionsList curPermissions = TPermissionsList(); + GetPkgPermissions(pkgId, curPermissions); + //Data compilation std::set permissionsSet = std::set< std::string>(permissions.begin(), permissions.end()); @@ -254,10 +240,6 @@ bool PrivilegeDb::UpdatePermissions(const std::string &appId, "Removed appId: " << appId << ", pkgId: " << pkgId << ", permission: " << removedPermission); } - return true; - }CATCH_STANDARD_EXCEPTIONS; - - return false; } } //namespace SecurityManager -- 2.7.4