From 1f87c5e933829d959e094b4193c9a39f171048f9 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Tue, 11 Dec 2012 17:38:20 +0000 Subject: [PATCH] edje: random code cleanup Some stuff spotted by scan-build SVN revision: 80676 --- legacy/edje/src/bin/edje_cc_handlers.c | 1 - legacy/edje/src/bin/edje_cc_out.c | 2 +- legacy/edje/src/bin/edje_cc_parse.c | 1 - legacy/edje/src/lib/edje_calc.c | 1 - legacy/edje/src/lib/edje_load.c | 6 +++--- legacy/edje/src/lib/edje_smart.c | 2 +- legacy/edje/src/lib/edje_textblock_styles.c | 1 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c index 63e9ac2d78..02c7fc2f4c 100644 --- a/legacy/edje/src/bin/edje_cc_handlers.c +++ b/legacy/edje/src/bin/edje_cc_handlers.c @@ -3339,7 +3339,6 @@ st_collections_group_parts_part_name(void) pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *)); current_part = pc->parts[i]; edje_cc_handlers_hierarchy_rename(ep, current_part); - ep = current_part; epp->can_override = EINA_FALSE; break; } diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c index dd084ab5cf..bd331724b4 100644 --- a/legacy/edje/src/bin/edje_cc_out.c +++ b/legacy/edje/src/bin/edje_cc_out.c @@ -1621,7 +1621,7 @@ data_write(void) INF("sounds: %3.5f", ecore_time_get() - t); t = ecore_time_get(); pending_threads--; if (pending_threads > 0) ecore_main_loop_begin(); - INF("THREADS: %3.5f", ecore_time_get() - t); t = ecore_time_get(); + INF("THREADS: %3.5f", ecore_time_get() - t); eet_close(ef); diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c index 42b68a4a6a..7f9bd10755 100644 --- a/legacy/edje/src/bin/edje_cc_parse.c +++ b/legacy/edje/src/bin/edje_cc_parse.c @@ -823,7 +823,6 @@ compile(void) /* * Run the input through the C pre-processor. */ - ret = -1; snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp" EPP_EXT, eina_prefix_lib_get(pfx)); if (ecore_file_exists(buf2)) diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index 23c071fddb..8c884d9ac4 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -21,7 +21,6 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T fp_pos = pos; - npos = ZERO; #if 0 // old code - easy to enable for comparing float vs fixed point /* take linear pos along timescale and use interpolation method */ switch (mode) diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index 428e7f6d0f..2e55cd395f 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -1135,9 +1135,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g return 1; on_error: - textblocks = eina_list_free(textblocks); - externals = eina_list_free(externals); - sources = eina_list_free(sources); + eina_list_free(textblocks); + eina_list_free(externals); + eina_list_free(sources); eina_array_flush(&parts); _edje_thaw(ed); _edje_unblock(ed); diff --git a/legacy/edje/src/lib/edje_smart.c b/legacy/edje/src/lib/edje_smart.c index decfc42dd8..fae11e00c1 100644 --- a/legacy/edje/src/lib/edje_smart.c +++ b/legacy/edje/src/lib/edje_smart.c @@ -226,7 +226,7 @@ _edje_smart_resize(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) ed->w = w; ed->h = h; #ifdef HAVE_EPHYSICS - if (ed->world) + if ((ed->collection) && (ed->world)) ephysics_world_render_geometry_set( ed->world, ed->x, ed->y, ed->collection->physics.world.z, ed->w, ed->h, ed->collection->physics.world.depth); diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c index bf7f330ffe..52ea02fbaa 100644 --- a/legacy/edje/src/lib/edje_textblock_styles.c +++ b/legacy/edje/src/lib/edje_textblock_styles.c @@ -186,7 +186,6 @@ _edje_textblock_style_all_update(Edje *ed) /* No text classes , goto next style */ if (!found) continue; - found = 0; if (!txt) txt = eina_strbuf_new();