From 4b80e98d1ee3ed025b9c37fb6817dc189f6d7df1 Mon Sep 17 00:00:00 2001 From: caro Date: Tue, 22 Sep 2009 22:37:03 +0000 Subject: [PATCH] move declaration of variables at the beginning of the block git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@42627 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_smart_clipped.c | 3 ++- src/lib/canvas/evas_object_table.c | 6 ++++-- src/lib/engines/common/evas_font_main.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_object_smart_clipped.c b/src/lib/canvas/evas_object_smart_clipped.c index 4eae6f5..2eef663 100644 --- a/src/lib/canvas/evas_object_smart_clipped.c +++ b/src/lib/canvas/evas_object_smart_clipped.c @@ -83,10 +83,11 @@ evas_object_smart_clipped_smart_add(Evas_Object *obj) static void evas_object_smart_clipped_smart_del(Evas_Object *obj) { - CSO_DATA_GET_OR_RETURN(obj, cso); Eina_List *lst, *itr; Evas_Object *data; + CSO_DATA_GET_OR_RETURN(obj, cso); + if (cso->clipper) { Evas_Object *clipper = cso->clipper; diff --git a/src/lib/canvas/evas_object_table.c b/src/lib/canvas/evas_object_table.c index 2de05bd..70c96c3 100644 --- a/src/lib/canvas/evas_object_table.c +++ b/src/lib/canvas/evas_object_table.c @@ -1090,9 +1090,10 @@ evas_object_table_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas Eina_Bool evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) { - EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0); Evas_Object_Table_Option *opt; + EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0); + if (rowspan < 1) { ERROR("rowspan < 1"); @@ -1212,9 +1213,10 @@ _evas_object_table_remove_opt(Evas_Object_Table_Data *priv, Evas_Object_Table_Op Eina_Bool evas_object_table_unpack(Evas_Object *o, Evas_Object *child) { - EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0); Evas_Object_Table_Option *opt; + EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0); + if (o != evas_object_smart_parent_get(child)) { ERROR("cannot unpack child from incorrect table!"); diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c index 73479ce..19293ab 100644 --- a/src/lib/engines/common/evas_font_main.c +++ b/src/lib/engines/common/evas_font_main.c @@ -194,12 +194,13 @@ evas_common_font_utf8_get_prev(const unsigned char *buf, int *iindex) * Returns 0 to indicate there is no prev char */ + int r; int index = *iindex; if (index <= 0) return 0; /* First obtain the codepoint at iindex */ - int r = evas_common_font_utf8_get_next(buf, &index); + r = evas_common_font_utf8_get_next(buf, &index); /* Next advance iindex to previous codepoint */ index = *iindex; -- 2.7.4