[SVACE] - fixing SVACE issues

Change-Id: I9b48cb71c1e95e7ab4b662f29541a9a339ba0fca
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc
index 26924297083b4d6bfb999fea383aa72cad884e6a..d7b5f53b2608d742e8174972643997c935eccf8f 100644 (file)
--- a/src/package/package_instance.cc
+++ b/src/package/package_instance.cc
@@ -226,10 +226,12 @@ PackageInstance::PackageInstance() {
     request_ = NULL;
   }
 
-  ret = package_manager_request_set_event_cb(request_, PackageRequestCb,
-                                             static_cast<void*>(this));
-  if (ret != PACKAGE_MANAGER_ERROR_NONE ) {
-    LoggerE("Failed to set request event callback: %d (%s)", ret, get_error_message(ret));
+  if (request_) {
+    ret = package_manager_request_set_event_cb(request_, PackageRequestCb,
+                                               static_cast<void*>(this));
+    if (ret != PACKAGE_MANAGER_ERROR_NONE ) {
+      LoggerE("Failed to set request event callback: %d (%s)", ret, get_error_message(ret));
+    }
   }
 
   ret = package_manager_create(&manager_);

diff --git a/src/systeminfo/systeminfo-utils.cpp b/src/systeminfo/systeminfo-utils.cpp
index 7ff4bc61a6d3689224a2646d9156a0ab3d02962f..ac7b6b95d04ebba4f9826b1da7a8c5441baed84d 100644 (file)
--- a/src/systeminfo/systeminfo-utils.cpp
+++ b/src/systeminfo/systeminfo-utils.cpp
@@ -30,7 +30,7 @@ namespace extension {
 namespace systeminfo {
 
 namespace {
-const int MEMORY_TO_BYTE = 1024;
+const short MEMORY_TO_BYTE = 1024;
 }  // namespace
 
 using common::PlatformResult;