kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: Fix shadow warnings 

SVN revision: 62563
This commit is contained in:
Sebastian Dransfeld 2011-08-18 10:59:34 +00:00
parent ea52155aeb
commit 08559f2c8b
6 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/edje/src/lib/edje_edit.c
View File

@ -5317,8 +5317,6 @@ edje_edit_program_del(Evas_Object *obj, const char *prog)
//We also update all other programs that point to old_id and id
for (i = 0; i < ed->table_programs_size; i++)
{
Edje_Program_After *pa;
p = ed->table_programs[i];
/* check in afters */
@ -5503,21 +5501,21 @@ edje_edit_program_signal_get(Evas_Object *obj, const char *prog)
}
EAPI Eina_Bool
edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *signal)
edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *sig)
{
eina_error_set(0);
GET_ED_OR_RETURN(EINA_FALSE);
GET_EPR_OR_RETURN(EINA_FALSE);
if (!signal) return EINA_FALSE;
if (!sig) return EINA_FALSE;
/* Remove from program array */
_edje_program_remove(ed->collection, epr);
_edje_if_string_free(ed, epr->signal);
/* Insert it back */
epr->signal = eina_stringshare_add(signal);
epr->signal = eina_stringshare_add(sig);
_edje_program_insert(ed->collection, epr);
//Update patterns

5
legacy/edje/src/lib/edje_load.c
View File

@ -560,7 +560,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
if (n > 0)
{
Edje_Program *pr;
unsigned int i;
ed->table_programs = malloc(sizeof(Edje_Program *) * n);
if (ed->table_programs)
@ -1384,7 +1383,7 @@ _edje_find_alias(Eina_Hash *aliased, char *src, int *length)
}
static void
_cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *source)
_cb_signal_repeat(void *data, Evas_Object *obj, const char *sig, const char *source)
{
Edje_Pack_Element *pack_it;
Evas_Object *parent;
@ -1491,5 +1490,5 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *
}
}
edje_object_signal_emit(parent, signal, alias ? alias : new_src);
edje_object_signal_emit(parent, sig, alias ? alias : new_src);
}

22
legacy/edje/src/lib/edje_match.c
View File

@ -454,7 +454,7 @@ edje_match_callback_exec_check_finals(const Edje_Patterns *singal_ppat,
const size_t *source_finals,
const Edje_States *signal_states,
const Edje_States *source_states,
const char *signal,
const char *sig,
const char *source,
Eina_List *callbacks,
Edje *ed)
@ -480,7 +480,7 @@ edje_match_callback_exec_check_finals(const Edje_Patterns *singal_ppat,
if ((!escb->just_added)
&& (!escb->delete_me))
{
escb->func(escb->data, ed->obj, signal, source);
escb->func(escb->data, ed->obj, sig, source);
r = 2;
}
if (_edje_block_break(ed))
@ -570,7 +570,7 @@ edje_match_collection_dir_exec(const Edje_Patterns *ppat,
Eina_Bool
edje_match_programs_exec(const Edje_Patterns *ppat_signal,
const Edje_Patterns *ppat_source,
const char *signal,
const char *sig,
const char *source,
Edje_Program **programs,
Eina_Bool (*func)(Edje_Program *pr, void *data),
@ -590,7 +590,7 @@ edje_match_programs_exec(const Edje_Patterns *ppat_signal,
ppat_source->patterns_size,
ppat_source->max_length);
signal_result = _edje_match_fn(ppat_signal, signal, ppat_signal->states);
signal_result = _edje_match_fn(ppat_signal, sig, ppat_signal->states);
source_result = _edje_match_fn(ppat_source, source, ppat_source->states);
if (signal_result && source_result)
@ -607,7 +607,7 @@ edje_match_programs_exec(const Edje_Patterns *ppat_signal,
int
edje_match_callback_exec(Edje_Patterns *ppat_signal,
Edje_Patterns *ppat_source,
const char *signal,
const char *sig,
const char *source,
Eina_List *callbacks,
Edje *ed)
@ -628,7 +628,7 @@ edje_match_callback_exec(Edje_Patterns *ppat_signal,
ppat_source->patterns_size,
ppat_source->max_length);
signal_result = _edje_match_fn(ppat_signal, signal, ppat_signal->states);
signal_result = _edje_match_fn(ppat_signal, sig, ppat_signal->states);
source_result = _edje_match_fn(ppat_source, source, ppat_source->states);
if (signal_result && source_result)
@ -638,7 +638,7 @@ edje_match_callback_exec(Edje_Patterns *ppat_signal,
ppat_source->finals,
signal_result,
source_result,
signal,
sig,
source,
callbacks,
ed);
@ -688,13 +688,13 @@ _edje_signal_source_node_cmp(const Edje_Signal_Source_Char *n1,
static int
_edje_signal_source_key_cmp(const Edje_Signal_Source_Char *node,
const char *signal,
const char *sig,
__UNUSED__ int length,
const char *source)
{
int cmp;
cmp = strcmp(node->signal, signal);
cmp = strcmp(node->signal, sig);
if (cmp) return cmp;
return strcmp(node->source, source);
@ -784,13 +784,13 @@ edje_match_callback_hash_build(const Eina_List *callbacks,
}
const Eina_List *
edje_match_signal_source_hash_get(const char *signal,
edje_match_signal_source_hash_get(const char *sig,
const char *source,
const Eina_Rbtree *tree)
{
Edje_Signal_Source_Char *lookup;
lookup = (Edje_Signal_Source_Char*) eina_rbtree_inline_lookup(tree, signal, 0,
lookup = (Edje_Signal_Source_Char*) eina_rbtree_inline_lookup(tree, sig, 0,
EINA_RBTREE_CMP_KEY_CB(_edje_signal_source_key_cmp), source);
if (lookup) return lookup->list;

10
legacy/edje/src/lib/edje_program.c
View File

@ -113,9 +113,9 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
((!escb->source && !source[0]) ||
(escb->source && !strcmp(escb->source, source))))
{
void *data;
void *data2;
data = escb->data;
data2 = escb->data;
if (ed->walking_callbacks)
{
escb->delete_me = 1;
@ -130,7 +130,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
if (escb->source) eina_stringshare_del(escb->source);
free(escb);
}
return data;
return data2;
}
}
return NULL;
@ -1164,7 +1164,7 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src)
{
Edje_Signal_Callback *escb;
const Eina_List *match;
const Eina_List *l;
const Eina_List *l2;
int r = 1;
_edje_callbacks_patterns_init(ed);
@ -1181,7 +1181,7 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src)
match = edje_match_signal_source_hash_get(sig, src,
ed->patterns.callbacks.exact_match);
EINA_LIST_FOREACH(match, l, escb)
EINA_LIST_FOREACH(match, l2, escb)
if ((!escb->just_added) && (!escb->delete_me))
{
escb->func(escb->data, ed->obj, sig, src);

3
legacy/edje/src/lib/edje_text.c
View File

@ -379,13 +379,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (fnt)
{
char *font2;
size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
font2 = alloca(len);
sprintf(font2, "edje/fonts/%s", font);
font = font2;
inlined_font = 1;
font2 = NULL;
}
}

2
legacy/edje/src/lib/edje_var.c
View File

@ -86,8 +86,6 @@ _edje_var_anim_cb(void *data __UNUSED__)
ed->var_pool->walking_list++;
while (tl2)
{
Edje_Var_Animator *ea;
ea = eina_list_data_get(tl2);
if ((ed->var_pool) && (!ea->delete_me))
{