enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

edje edit - make source set api clearer as to what it does for coverity 

this addresses CID 1222452 - this fallthough is intended, so
document it and make the code clearer
This commit is contained in:
Carsten Haitzler 2014-08-13 23:37:54 +09:00
parent e97af447ef
commit 3eb9e586ef
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/lib/edje/edje_edit.c
View File

@ -3783,38 +3783,33 @@ edje_edit_part_source_set(Evas_Object *obj, const char *part, const char *source
Evas_Object *child_obj; Evas_Object *child_obj;
//printf("Set source for part: %s [source: %s]\n", part, source); //printf("Set source for part: %s [source: %s]\n", part, source);
switch(rp->part->type) switch (rp->part->type)
{ {
case EDJE_PART_TYPE_GROUP: case EDJE_PART_TYPE_GROUP:
{ if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object))
if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object)) {
{ _edje_real_part_swallow_clear(ed, rp);
_edje_real_part_swallow_clear(ed, rp); evas_object_del(rp->typedata.swallow->swallowed_object);
evas_object_del(rp->typedata.swallow->swallowed_object); rp->typedata.swallow->swallowed_object = NULL;
rp->typedata.swallow->swallowed_object = NULL; }
} if (source)
if (source) {
{ child_obj = edje_object_add(ed->base->evas);
child_obj = edje_object_add(ed->base->evas); edje_object_file_set(child_obj, ed->file->path, source);
edje_object_file_set(child_obj, ed->file->path, source); _edje_real_part_swallow(ed, rp, child_obj, EINA_TRUE);
_edje_real_part_swallow(ed, rp, child_obj, EINA_TRUE); }
} // this fall through case is intentional
}
case EDJE_PART_TYPE_TEXTBLOCK: case EDJE_PART_TYPE_TEXTBLOCK:
{ _edje_if_string_free(ed, rp->part->source);
_edje_if_string_free(ed, rp->part->source); if (source)
if (source) rp->part->source = eina_stringshare_add(source);
rp->part->source = eina_stringshare_add(source); else
else rp->part->source = NULL;
rp->part->source = NULL; return EINA_TRUE;
return EINA_TRUE;
}
case EDJE_PART_TYPE_EXTERNAL: //EXTERNAL part has source property but it cannot be changed case EDJE_PART_TYPE_EXTERNAL: //EXTERNAL part has source property but it cannot be changed
default: break;
{
return EINA_FALSE;
}
} }
return EINA_FALSE;
} }
#define TEXT_BLOCK_SOURCE_GET(N) \ #define TEXT_BLOCK_SOURCE_GET(N) \