tizen 2.3 releasetizen_2.3_releasesubmit/tizen_2.3/20150202.052807tizen_2.3

6 files changed, 23 insertions, 27 deletions

diff --git a/packaging/xorg-x11-drv-exynos.spec b/packaging/xorg-x11-drv-exynos.spec
index 67397d2..0e8a833 100644
--- a/packaging/xorg-x11-drv-exynos.spec
+++ b/packaging/xorg-x11-drv-exynos.spec
@@ -14,7 +14,6 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  prelink
 BuildRequires:  xorg-x11-xutils-dev
 BuildRequires:  pkgconfig(xorg-server)
-BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(fontsproto)
 BuildRequires:  pkgconfig(randrproto)
@@ -42,7 +41,7 @@ rm -rf %{buildroot}
 # >> build pre
 # << build pre
 
-%if %{_repository} == "wearable" 
+%if %{?tizen_profile_name} == "wearable" 
 export CFLAGS+=" -D_F_WEARABLE_PROFILE_ "
 %endif
 
diff --git a/src/accel/sec_exa_g2d.c b/src/accel/sec_exa_g2d.c
index d4e7e58..be31349 100755
--- a/src/accel/sec_exa_g2d.c
+++ b/src/accel/sec_exa_g2d.c
@@ -244,8 +244,8 @@ ExaBox* _g2dBoxAdd (struct xorg_list *l, BoxPtr b1, BoxPtr b2)
 
 void _g2dBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 {
-    ExaBox *b1, *b2;
-    ExaBox* r=NULL;
+    ExaBox *b1 = NULL, *b2 = NULL;
+    ExaBox* r = NULL;
 
     xorg_list_for_each_entry (b1, b, link)
     {
@@ -264,7 +264,7 @@ void _g2dBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t
 
 void _g2dBoxMove (struct xorg_list* l, int tx, int ty)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, l, link)
     {
@@ -274,7 +274,7 @@ void _g2dBoxMove (struct xorg_list* l, int tx, int ty)
 
 void _g2dBoxRemoveAll (struct xorg_list* l)
 {
-    ExaBox *ref, *next;
+    ExaBox *ref = NULL, *next = NULL;
 
     xorg_list_for_each_entry_safe (ref, next, l, link)
     {
@@ -298,7 +298,7 @@ int _g2dBoxIsOne (struct xorg_list* l)
 
 void _g2dBoxPrint (ExaBox* sb1, const char* name)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, &sb1->link, link)
     {
@@ -468,7 +468,7 @@ static ExaOpInfo* _g2dPrepareAccess (PixmapPtr pPix, int index, unsigned int dev
     ExaOpInfo* op = &OpInfo[index];
     int opt = TBM_OPTION_READ;
     int i;
-    tbm_bo *bos;
+    tbm_bo *bos = NULL;
     tbm_bo_handle bo_handle;
     SECFbBoDataPtr bo_data;
     int num_bo;
@@ -550,10 +550,9 @@ static ExaOpInfo* _g2dPrepareAccess (PixmapPtr pPix, int index, unsigned int dev
                                                                                                 op->buf[i].access_data);
                 }
             }
-
-            if (bos)
-                free (bos);
         }
+        if (bos)
+            free (bos);
     }
     else
     {
@@ -644,7 +643,7 @@ static void _g2dFinishAccess (PixmapPtr pPix, int index)
 void
 _g2dDoDraw (struct xorg_list *l, DoDrawProcPtrEx do_draw, void* data)
 {
-    ExaBox *box;
+    ExaBox *box = NULL;
     xorg_list_for_each_entry (box, l, link)
     {
         do_draw (box, data);
diff --git a/src/accel/sec_exa_sw.c b/src/accel/sec_exa_sw.c
index 1093c05..df87e34 100755
--- a/src/accel/sec_exa_sw.c
+++ b/src/accel/sec_exa_sw.c
@@ -185,7 +185,7 @@ ExaBox* _swBoxAdd (struct xorg_list *l, BoxPtr b1, BoxPtr b2)
 
 void _swBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 {
-    ExaBox *b1, *b2;
+    ExaBox *b1 = NULL, *b2 = NULL;
     ExaBox* r=NULL;
 
     xorg_list_for_each_entry (b1, b, link)
@@ -205,7 +205,7 @@ void _swBoxMerge (struct xorg_list *l, struct xorg_list* b, struct xorg_list* t)
 
 void _swBoxMove (struct xorg_list* l, int tx, int ty)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, l, link)
     {
@@ -215,7 +215,7 @@ void _swBoxMove (struct xorg_list* l, int tx, int ty)
 
 void _swBoxRemoveAll (struct xorg_list* l)
 {
-    ExaBox *ref, *next;
+    ExaBox *ref = NULL, *next = NULL;
 
     xorg_list_for_each_entry_safe (ref, next, l, link)
     {
@@ -239,7 +239,7 @@ int _swBoxIsOne (struct xorg_list* l)
 
 void _swBoxPrint (ExaBox* sb1, const char* name)
 {
-    ExaBox *b;
+    ExaBox *b = NULL;
 
     xorg_list_for_each_entry (b, &sb1->link, link)
     {
@@ -429,7 +429,7 @@ static void _swFinishAccess (PixmapPtr pPix, int index)
 void
 _swDoDraw (struct xorg_list *l, DoDrawProcPtrEx do_draw, void* data)
 {
-    ExaBox *box;
+    ExaBox *box = NULL;
     xorg_list_for_each_entry (box, l, link)
     {
         do_draw (box, data);
diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index abe2f61..c8e8a69 100755
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -1906,7 +1906,7 @@ Bool
 secCrtcCursorEnable (ScrnInfoPtr pScrn, Bool enable)
 {
     SECModePtr pSecMode = (SECModePtr) SECPTR (pScrn)->pSecMode;
-    SECCrtcPrivPtr pCur, pNext;
+    SECCrtcPrivPtr pCur = NULL, pNext = NULL;
 
     xorg_list_for_each_entry_safe (pCur, pNext, &pSecMode->crtcs, link)
     {
diff --git a/src/crtcconfig/sec_display.c b/src/crtcconfig/sec_display.c
index ffda1a0..051903e 100755
--- a/src/crtcconfig/sec_display.c
+++ b/src/crtcconfig/sec_display.c
@@ -567,21 +567,21 @@ secModeDeinit (ScrnInfoPtr pScrn)
 
     secDisplayDeinitDispMode (pScrn);
 
-    SECCrtcPrivPtr crtc_ref=NULL, crtc_next=NULL;
+    SECCrtcPrivPtr crtc_ref = NULL, crtc_next = NULL;
     xorg_list_for_each_entry_safe (crtc_ref, crtc_next, &pSecMode->crtcs, link)
     {
         pCrtc = crtc_ref->pCrtc;
         xf86CrtcDestroy (pCrtc);
     }
 
-    SECOutputPrivPtr output_ref, output_next;
+    SECOutputPrivPtr output_ref = NULL, output_next = NULL;
     xorg_list_for_each_entry_safe (output_ref, output_next, &pSecMode->outputs, link)
     {
         pOutput = output_ref->pOutput;
         xf86OutputDestroy (pOutput);
     }
 
-    SECPlanePrivPtr plane_ref, plane_next;
+    SECPlanePrivPtr plane_ref = NULL, plane_next = NULL;
     xorg_list_for_each_entry_safe (plane_ref, plane_next, &pSecMode->planes, link)
     {
         secPlaneDeinit (pScrn, plane_ref);
@@ -1636,9 +1636,8 @@ Bool secDisplayUpdateRequest(ScrnInfoPtr pScrn)
             * That means only LCD buffer is updated.
             * Frame buffer is not swapped. Because these request is only for FB_BLIT case!
             */
-            ret = drmModePageFlip (pSec->drm_fd, secCrtcID(pCrtcPriv), fb_id,
-                    DRM_MODE_PAGE_FLIP_EVENT, pPageFlip);
-            if (ret)
+            if (drmModePageFlip (pSec->drm_fd, secCrtcID(pCrtcPriv), fb_id,
+                                 DRM_MODE_PAGE_FLIP_EVENT, pPageFlip))
             {
                 XDBG_ERRNO (MDISP, "Page flip failed: %s\n", strerror (errno));
                 goto fail;
diff --git a/src/crtcconfig/sec_output.c b/src/crtcconfig/sec_output.c
index b0e5e41..242472c 100755
--- a/src/crtcconfig/sec_output.c
+++ b/src/crtcconfig/sec_output.c
@@ -704,8 +704,7 @@ secOutputDrmUpdate (ScrnInfoPtr pScrn)
 
     for (i = 0; i < pSecMode->mode_res->count_connectors; i++)
     {
-        SECOutputPrivPtr pOutputPriv = NULL;
-        SECOutputPrivPtr pCur, pNext;
+        SECOutputPrivPtr pCur = NULL, pNext = NULL, pOutputPriv = NULL;
         drmModeConnectorPtr koutput;
         drmModeEncoderPtr kencoder;
         char *conn_str[] = {"connected", "disconnected", "unknow"};
@@ -861,7 +860,7 @@ secOutputGetPrivateForConnType (ScrnInfoPtr pScrn, int connect_type)
 
     for (i = 0; i < pSecMode->mode_res->count_connectors; i++)
     {
-        SECOutputPrivPtr pCur, pNext;
+        SECOutputPrivPtr pCur = NULL, pNext = NULL;
 
         xorg_list_for_each_entry_safe (pCur, pNext, &pSecMode->outputs, link)
         {