Revert "Fix svace issues" 26/153326/1
authorJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 04:34:58 +0000 (13:34 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 04:35:00 +0000 (13:35 +0900)
This reverts commit 542f365adb39027f50b8d7b957404ad69c767035.

Change-Id: I8135ff638ed4fff2458e5df10608ff98b5afbd06

adaptors/ecore/wayland/window-impl-ecore-wl.cpp
adaptors/widget/internal/widget-impl.cpp

index 6a71e00..971be10 100644 (file)
@@ -211,10 +211,7 @@ struct Window::EventHandler
     if ( handler && handler->mWindow && transformEvent->output == ecore_wl_window_output_find( handler->mEcoreWindow ) )
     {
       ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( handler->mWindow->mSurface ) );
-      if( wlSurface )
-      {
-        wlSurface->OutputTransformed();
-      }
+      wlSurface->OutputTransformed();
     }
 
     return ECORE_CALLBACK_PASS_ON;
@@ -229,10 +226,7 @@ struct Window::EventHandler
     if ( handler && handler->mWindow && ignoreTransformEvent->win == handler->mEcoreWindow )
     {
       ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( handler->mWindow->mSurface ) );
-      if( wlSurface )
-      {
-        wlSurface->OutputTransformed();
-      }
+      wlSurface->OutputTransformed();
     }
 
     return ECORE_CALLBACK_PASS_ON;
index 877bf79..b16f1eb 100644 (file)
@@ -58,7 +58,7 @@ static bool IsWidgetFeatureEnabled()
   int ret;
 
   if(retrieved == true)
-    return feature;
+         return feature;
 
   ret = system_info_get_platform_bool("http://tizen.org/feature/shell.appwidget", &feature);
   if(ret != SYSTEM_INFO_ERROR_NONE)
@@ -79,26 +79,26 @@ static int SendLifecycleEvent(const char* classId, const char* instanceId, int s
 
   if (bundleData == NULL)
   {
-    DALI_LOG_ERROR("out of memory");
-    return -1;
+         DALI_LOG_ERROR("out of memory");
+         return -1;
   }
 
   bundle_add_str(bundleData, AUL_K_WIDGET_ID, classId);
   bundle_add_str(bundleData, AUL_K_WIDGET_INSTANCE_ID, instanceId);
   bundle_add_byte(bundleData, AUL_K_WIDGET_STATUS, &status, sizeof(int));
 
+
   char temp[256] = {0, };
   char *packageId = NULL;
   if(aul_app_get_pkgid_bypid(getpid(), temp, sizeof(temp)) == 0)
   {
-    packageId = strdup(temp);
+         packageId = strdup(temp);
   }
 
   if(!packageId)
   {
-    DALI_LOG_ERROR("package_id is NULL");
-    bundle_free(bundleData);
-    return -1;
+         DALI_LOG_ERROR("package_id is NULL");
+         return -1;
   }
   bundle_add_str(bundleData, AUL_K_PKGID, packageId);
 
@@ -107,7 +107,6 @@ static int SendLifecycleEvent(const char* classId, const char* instanceId, int s
   if (ret < 0)
     DALI_LOG_ERROR("send lifecycle error:%d\n", ret);
 
-  free(packageId);
   bundle_free(bundleData);
 
   return ret;