utest: fix warnings

Change-Id: I5bdb832d6074481723a7ddd14a4b1028f7701188
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --git a/utests/src/ut_tdm_layer.cpp b/utests/src/ut_tdm_layer.cpp
index 21a552d..0d629f6 100644 (file)
--- a/utests/src/ut_tdm_layer.cpp
+++ b/utests/src/ut_tdm_layer.cpp
@@ -561,8 +561,7 @@ TEST_F(TDMLayer, LayerGetZposFailNullAll)
 TEST_F(TDMLayer,  LayerGetZposFailNullLayer)
 {
        SKIP_FLAG(has_layers);
-       ASSERT_EXIT({const tdm_prop *props;
-                                int zpos;
+       ASSERT_EXIT({int zpos;
                                 if (tdm_layer_get_zpos(NULL, &zpos) == TDM_ERROR_NONE) exit(1);
                                 exit(0);}, ::testing::ExitedWithCode(0), "");
 }
@@ -570,8 +569,7 @@ TEST_F(TDMLayer,  LayerGetZposFailNullLayer)
 TEST_F(TDMLayer, LayerGetZposFailNullZpos)
 {
        SKIP_FLAG(has_layers);
-       ASSERT_EXIT({int count;
-                                for (int i = 0; i < layer_count; i++) {
+       ASSERT_EXIT({for (int i = 0; i < layer_count; i++) {
                                         if (tdm_layer_get_zpos(tdm_layer_array[i], NULL) == TDM_ERROR_NONE) exit(1);
                                }
                                exit(0);}, ::testing::ExitedWithCode(0), "");
@@ -628,8 +626,7 @@ TEST_F(TDMLayer,  LayerGetPropertyFailNullLayer)
 TEST_F(TDMLayer,  LayerGetPropertyFailNullValue)
 {
        SKIP_FLAG(has_layers);
-       ASSERT_EXIT({tdm_value value;
-                                int id = INT_MAX;
+       ASSERT_EXIT({int id = INT_MAX;
                                 for (int i = 0; i < layer_count; ++i) {
                                        if (tdm_layer_get_property(tdm_layer_array[i], id, NULL) == TDM_ERROR_NONE) exit(1);
                                 }
@@ -654,9 +651,7 @@ TEST_F(TDMLayer,  LayerGetPropertyFailWrongId)
 TEST_F(TDMLayer,  LayerSetInfoFailNullAll)
 {
        SKIP_FLAG(has_layers);
-       ASSERT_EXIT({tdm_value value;
-                                int id = INT_MAX;
-                                if (tdm_layer_set_info(NULL, NULL) == TDM_ERROR_NONE) exit(1);
+       ASSERT_EXIT({if (tdm_layer_set_info(NULL, NULL) == TDM_ERROR_NONE) exit(1);
                                 exit(0);}, ::testing::ExitedWithCode(0), "");
 }
 
@@ -673,8 +668,7 @@ TEST_F(TDMLayer,  LayerSetInfoFailNullInfo)
 {
        SKIP_FLAG(has_layers);
 
-       ASSERT_EXIT({tdm_info_layer info = {0};
-                                for (int i = 0; i < layer_count; ++i)
+       ASSERT_EXIT({for (int i = 0; i < layer_count; ++i)
                                        if (tdm_layer_set_info(tdm_layer_array[i], NULL) == TDM_ERROR_NONE) exit(1);
                                 exit(0);}, ::testing::ExitedWithCode(0), "");
 }
@@ -716,9 +710,7 @@ TEST_F(TDMLayer,  LayerSetInfoSuccess)
 TEST_F(TDMLayer,  LayerGetInfoFailNullAll)
 {
        SKIP_FLAG(has_layers);
-       ASSERT_EXIT({tdm_value value;
-                                int id = INT_MAX;
-                                if (tdm_layer_get_info(NULL, NULL) == TDM_ERROR_NONE) exit(1);
+       ASSERT_EXIT({if (tdm_layer_get_info(NULL, NULL) == TDM_ERROR_NONE) exit(1);
                                 exit(0);}, ::testing::ExitedWithCode(0), "");
 }
 
@@ -735,8 +727,7 @@ TEST_F(TDMLayer,  LayerGetInfoFailNullInfo)
 {
        SKIP_FLAG(has_layers);
 
-       ASSERT_EXIT({tdm_info_layer info = {0};
-                                for (int i = 0; i < layer_count; ++i)
+       ASSERT_EXIT({for (int i = 0; i < layer_count; ++i)
                                        if (tdm_layer_get_info(tdm_layer_array[i], NULL) == TDM_ERROR_NONE) exit(1);
                                 exit(0);}, ::testing::ExitedWithCode(0), "");
 }
@@ -1749,12 +1740,12 @@ TEST_F(TDMLayerCommitThread, LayerSetBufferQueueSuccessRemoveBufferQueue)
                ASSERT_EQ(TDM_ERROR_NONE, error);
 
                tbm_err = tbm_surface_queue_dequeue(buffer_queue, &surface);
-               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, error);
+               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, tbm_err);
 
                tdm_layer_commit(tdm_layer_array[i], NULL, NULL);
 
                tbm_err = tbm_surface_queue_enqueue(buffer_queue, surface);
-               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, error);
+               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, tbm_err);
        }
 
        /* FIXME: use another func. */
@@ -1804,12 +1795,12 @@ TEST_F(TDMLayerCommitWithDisabledCommitPerVblank, LayerSetBufferQueueSuccessRemo
                ASSERT_EQ(TDM_ERROR_NONE, error);
 
                tbm_err = tbm_surface_queue_dequeue(buffer_queue, &surface);
-               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, error);
+               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, tbm_err);
 
                tdm_layer_commit(tdm_layer_array[i], NULL, NULL);
 
                tbm_err = tbm_surface_queue_enqueue(buffer_queue, surface);
-               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, error);
+               ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, tbm_err);
        }
 
        /* FIXME: use another func. */

diff --git a/utests/src/ut_tdm_pp.cpp b/utests/src/ut_tdm_pp.cpp
index fdd1353..2ff78c9 100644 (file)
--- a/utests/src/ut_tdm_pp.cpp
+++ b/utests/src/ut_tdm_pp.cpp
@@ -249,10 +249,7 @@ protected:
 
        void SetUp(void)
        {
-               tdm_error error;
-               tdm_output *output;
                struct epoll_event ep;
-               tdm_pp_capability pp_capability;
 
                ASSERT_NO_FATAL_FAILURE(TDMPP::SetUp());
 
@@ -277,8 +274,6 @@ protected:
 
        void TearDown(void)
        {
-               tdm_error error;
-
                if (epFd)
                        close(epFd);
                if (timerFd)
@@ -351,13 +346,12 @@ protected:
                if (error != TDM_ERROR_NONE)
                        return -1;
 
+               return 0;
        }
 
        int UtPrepareToPPWithScale()
        {
                tdm_info_pp info = {0};
-               tdm_error error;
-               tbm_surface_h src_buf, dst_buf;
 
                UtGetPPInfoWithScale(&info);
 
@@ -367,8 +361,6 @@ protected:
        int UtPrepareToPPWithScaleAndTransform()
        {
                tdm_info_pp info = {0};
-               tdm_error error;
-               tbm_surface_h src_buf, dst_buf;
 
                UtGetPPInfoWithScaleAndTransform(&info);
 
@@ -379,7 +371,6 @@ protected:
        {
                tdm_info_pp info = {0};
                tdm_error error;
-               tbm_surface_h src_buf, dst_buf;
                int ret;
 
                UtGetPPInfoWithScale(&info);
@@ -543,7 +534,6 @@ TEST_F(TDMPP, PpSetDoneHandlerFailNullPP)
 {
        SKIP_FLAG(has_pp);
        tdm_error error;
-       int data;
 
        error = tdm_pp_set_done_handler(NULL, UtPpDoneHandler, this);
        ASSERT_NE(TDM_ERROR_NONE, error);
@@ -572,7 +562,6 @@ TEST_F(TDMPP, PpSetDoneHandlerSuccess)
 {
        SKIP_FLAG(has_pp);
        tdm_error error;
-       int data;
 
        error = tdm_pp_set_done_handler(pp, UtPpDoneHandler, this);
        ASSERT_EQ(TDM_ERROR_NONE, error);

diff --git a/utests/src/ut_tdm_vblank.cpp b/utests/src/ut_tdm_vblank.cpp
index b8701ab..b2cacdc 100644 (file)
--- a/utests/src/ut_tdm_vblank.cpp
+++ b/utests/src/ut_tdm_vblank.cpp
@@ -1123,6 +1123,8 @@ void *UtWaitVblankThreadHndl(void *ptr)
                vblankWait->utWaitVblankThreadHndlResult = 0;
        else
                vblankWait->utWaitVblankThreadHndlResult = 0;
+
+       return NULL;
 }
 
 TEST_F(TDMVblankWait, VblankWaitFailInOtherThread)
@@ -1792,6 +1794,8 @@ void *UtWaitVblankSeqThreadHndl(void *ptr)
                vblankWait->utWaitVblankSeqThreadHndlResult = 0;
        else
                vblankWait->utWaitVblankSeqThreadHndlResult = 0;
+
+       return NULL;
 }
 
 TEST_F(TDMVblankWait, VblankWaitSeqFailInOtherThread)