summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Oleynik <AOleynik@luxoft.com>2014-07-16 16:40:59 +0300
committerAndrey Oleynik <AOleynik@luxoft.com>2014-07-16 16:40:59 +0300
commitabe1fab3478913b19316cbb4fb21cca248124bef (patch)
treed5376ef478011456a71e0ef5d863311dd4aebec0
parent16ed9535bb4c9493da5fa95c64d25bf749bd403c (diff)
downloadsdl_core-abe1fab3478913b19316cbb4fb21cca248124bef.tar.gz
APPLINK-8098. Fix code review notes.
-rw-r--r--src/appMain/life_cycle.cc1
-rw-r--r--src/components/application_manager/include/application_manager/commands/command.h1
-rw-r--r--src/components/application_manager/src/application_impl.cc6
-rw-r--r--src/components/application_manager/src/commands/command_request_impl.cc8
-rw-r--r--src/components/utils/src/system.cc4
5 files changed, 11 insertions, 9 deletions
diff --git a/src/appMain/life_cycle.cc b/src/appMain/life_cycle.cc
index d4d7455a59..de354771e4 100644
--- a/src/appMain/life_cycle.cc
+++ b/src/appMain/life_cycle.cc
@@ -111,6 +111,7 @@ bool LifeCycle::StartComponents() {
application_manager::ApplicationManagerImpl::instance();
DCHECK(app_manager_ != NULL);
if (!app_manager_->Init()) {
+ LOG4CXX_ERROR(logger_, "Application manager init failed.");
return false;
}
diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h
index fef9a66105..afcfdbf329 100644
--- a/src/components/application_manager/include/application_manager/commands/command.h
+++ b/src/components/application_manager/include/application_manager/commands/command.h
@@ -56,6 +56,7 @@ class Command {
* @brief Checks command permissions according to policy table
*/
virtual bool CheckPermissions() = 0;
+
/**
* @brief Command initialization function
**/
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index 5138e70e7b..098a8b11e2 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -474,11 +474,11 @@ bool ApplicationImpl::IsCommandLimitsExceeded(
uint32_t cmd_limit = application_manager::MessageHelper::GetAppCommandLimit(
mobile_app_id_->asString());
- if (!cmd_limit) {
+ if (0 == cmd_limit) {
return true;
}
- uint32_t dummy_limit = 1;
+ const uint32_t dummy_limit = 1;
CommandNumberTimeLimit::iterator it =
cmd_number_to_time_limits_.find(cmd_id);
// If no command with cmd_id had been executed yet, just add to limits
@@ -487,7 +487,7 @@ bool ApplicationImpl::IsCommandLimitsExceeded(
return false;
}
- uint32_t minute = 60;
+ const uint32_t minute = 60;
TimeToNumberLimit& limit = it->second;
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index b924b6d3c5..a60820b82e 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -382,7 +382,7 @@ bool CommandRequestImpl::CheckAllowedParameters() {
smart_objects::SmartObject* response =
MessageHelper::CreateBlockedByPoliciesResponse(
static_cast<mobile_api::FunctionID::eType>(function_id()),
- check_result, correlation_id(), (*it_app_list).get()->app_id());
+ check_result, correlation_id(), (*it_app_list)->app_id());
ApplicationManagerImpl::instance()->SendMessageToMobile(response);
return false;
@@ -390,9 +390,9 @@ bool CommandRequestImpl::CheckAllowedParameters() {
// If no parameters specified in policy table, no restriction will be
// applied for parameters
- if (!params_permissions.allowed_params.size() &&
- !params_permissions.disallowed_params.size() &&
- !params_permissions.undefined_params.size()) {
+ if (params_permissions.allowed_params.empty() &&
+ params_permissions.disallowed_params.empty() &&
+ params_permissions.undefined_params.empty()) {
return true;
}
diff --git a/src/components/utils/src/system.cc b/src/components/utils/src/system.cc
index 078a67c331..ee90315db0 100644
--- a/src/components/utils/src/system.cc
+++ b/src/components/utils/src/system.cc
@@ -29,8 +29,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "utils/system.h"
-
#ifdef __QNX__
# include <process.h>
#else // __QNX__
@@ -43,8 +41,10 @@
#include <algorithm>
#include <functional>
+#include <cstring>
#include "utils/logger.h"
+#include "utils/system.h"
namespace utils {