From: cedric Date: Wed, 21 Apr 2010 16:10:55 +0000 (+0000) Subject: * eet: use const only when needed. X-Git-Tag: submit/2.0alpha-wayland/20121127.222001~344 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59c8d964492f520cfd26c046d210c90eda50023b;p=profile%2Fivi%2Feet.git * eet: use const only when needed. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eet@48204 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/eet_data.c b/src/lib/eet_data.c index 45160ca..56a14ce 100644 --- a/src/lib/eet_data.c +++ b/src/lib/eet_data.c @@ -2958,6 +2958,7 @@ eet_data_get_union(Eet_Free_Context *context, const Eet_Dictionary *ed, if (strcmp(ede->subtype->elements.set[i].name, union_type) == 0) { Eet_Data_Element *sede; + char *ut; /* Yeah we found it ! */ sede = &(ede->subtype->elements.set[i]); @@ -2979,16 +2980,16 @@ eet_data_get_union(Eet_Free_Context *context, const Eet_Dictionary *ed, /* Set union type. */ if ((!ed) || (!ede->subtype->func.str_direct_alloc)) { - union_type = ede->subtype->func.str_alloc(union_type); - _eet_freelist_str_add(context, (char*) union_type); + ut = ede->subtype->func.str_alloc(union_type); + _eet_freelist_str_add(context, ut); } else { - union_type = ede->subtype->func.str_direct_alloc(union_type); - _eet_freelist_direct_str_add(context, (char*) union_type); + ut = ede->subtype->func.str_direct_alloc(union_type); + _eet_freelist_direct_str_add(context, ut); } - ede->subtype->func.type_set(union_type, + ede->subtype->func.type_set(ut, ((char*) data) + ede->count - ede->offset, EINA_FALSE); @@ -3142,17 +3143,19 @@ eet_data_get_variant(Eet_Free_Context *context, const Eet_Dictionary *ed, if (ede) { + char *ut; + EET_ASSERT(ede->subtype, goto on_error); if ((!ed) || (!ede->subtype->func.str_direct_alloc)) { - union_type = ede->subtype->func.str_alloc(union_type); - _eet_freelist_str_add(context, (char*) union_type); + ut = ede->subtype->func.str_alloc(union_type); + _eet_freelist_str_add(context, ut); } else { - union_type = ede->subtype->func.str_direct_alloc(union_type); - _eet_freelist_direct_str_add(context, (char*) union_type); + ut = ede->subtype->func.str_direct_alloc(union_type); + _eet_freelist_direct_str_add(context, ut); } /* Search the structure of the union to decode */ @@ -3199,7 +3202,7 @@ eet_data_get_variant(Eet_Free_Context *context, const Eet_Dictionary *ed, data_ret = (void*) data; /* Set variant type. */ - ede->subtype->func.type_set(union_type, + ede->subtype->func.type_set(ut, ((char*) data) + ede->count - ede->offset, EINA_FALSE); break; @@ -3216,7 +3219,7 @@ eet_data_get_variant(Eet_Free_Context *context, const Eet_Dictionary *ed, *(void**) data = data_ret; /* Set variant type. */ - ede->subtype->func.type_set(union_type, + ede->subtype->func.type_set(ut, ((char*) data) + ede->count - ede->offset, EINA_FALSE); break; @@ -3237,7 +3240,7 @@ eet_data_get_variant(Eet_Free_Context *context, const Eet_Dictionary *ed, *(void**) data = evu; /* Set variant type. */ - ede->subtype->func.type_set(union_type, + ede->subtype->func.type_set(ut, ((char*) data) + ede->count - ede->offset, EINA_TRUE); }