From 04f705bbc8b48ea18a3c71f4256628cd06921f9b Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Wed, 19 Jun 2019 10:19:49 +0200 Subject: [PATCH] Fix miscellaneous build warnings Nothing serious, but they were driving me mad. --- src/examples/elementary/toolbar_cxx_example_01.cc | 2 +- src/lib/elementary/elm_slider.c | 2 +- src/lib/evas/common/evas_scale_sample.c | 2 +- src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c | 3 ++- src/tests/efl/efl_test_composite_model.c | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc index a32f492..278a1bf 100644 --- a/src/examples/elementary/toolbar_cxx_example_01.cc +++ b/src/examples/elementary/toolbar_cxx_example_01.cc @@ -11,7 +11,7 @@ #include EAPI int -elm_main(int argc, char* argv[]) +elm_main(int argc EINA_UNUSED, char* argv[] EINA_UNUSED) { elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index c1fc600..ef27814 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -573,7 +573,7 @@ void _elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_event) { double posx = 0.0, posy = 0.0, pos = 0.0, val; - double posx2 = 0.0, posy2 = 0.0, pos2 = 0.0, val2; + double posx2 = 0.0, posy2 = 0.0, pos2 = 0.0, val2 = 0.0; Eina_Bool inverted = EINA_FALSE; Eina_Bool evented = EINA_FALSE; diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c index c201dfb..136813e 100644 --- a/src/lib/evas/common/evas_scale_sample.c +++ b/src/lib/evas/common/evas_scale_sample.c @@ -103,7 +103,7 @@ _evas_common_scale_rgba_sample_scale_nomask(int y, DATA32 *dptr, RGBA_Gfx_Func func, unsigned int mul_col, DATA32 *srcptr, int src_w) { - DATA32 *buf; + DATA32 *buf = NULL; int x; /* a scanline buffer */ diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c index f00819c..b1e6a57 100644 --- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c +++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c @@ -658,7 +658,8 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7) { char buf; - read(p[0], &buf, 1); + if (read(p[0], &buf, 1) != 1) + if (DEBUG) printf("Error reading from pipe\n"); msg = eina_thread_queue_wait(thq1, &ref); if (msg) { diff --git a/src/tests/efl/efl_test_composite_model.c b/src/tests/efl/efl_test_composite_model.c index 48511a9..877410b 100644 --- a/src/tests/efl/efl_test_composite_model.c +++ b/src/tests/efl/efl_test_composite_model.c @@ -323,7 +323,7 @@ _count_changed(void *data, const Efl_Event *ev) { Eina_Promise *p = data; - if (efl_model_children_count_get(ev->object) != child_number) return ; + if (efl_model_children_count_get(ev->object) != (unsigned int)child_number) return ; efl_event_callback_del(ev->object, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, _count_changed, p); @@ -380,8 +380,8 @@ _check_index(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Value v) idx = efl_composite_model_index_get(target); p_original = efl_model_property_get(target, "original"); fail_if(!eina_value_uint64_convert(p_original, &original)); - ck_assert(original < child_number); - ck_assert(idx < child_number); + ck_assert(original < (uint64_t)child_number); + ck_assert(idx < (uint64_t)child_number); eina_value_free(p_original); } -- 2.7.4