forked from enlightenment/efl
efl: Avoid shadow warnings (signal -> sig)
Signed-off-by: Mike McCormack <mikem@atratus.org> SVN revision: 82669
This commit is contained in:
parent
66f4a7f14e
commit
a06b6095f6
|
@ -62,30 +62,30 @@ arg_free(DBus_Arg *arg)
|
||||||
DBus_Signal *
|
DBus_Signal *
|
||||||
signal_new(DBus_Interface *iface)
|
signal_new(DBus_Interface *iface)
|
||||||
{
|
{
|
||||||
DBus_Signal *signal = calloc(1, sizeof(DBus_Signal));
|
DBus_Signal *sig = calloc(1, sizeof(DBus_Signal));
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(signal, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(sig, NULL);
|
||||||
iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(signal));
|
iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(sig));
|
||||||
signal->iface = iface;
|
sig->iface = iface;
|
||||||
return signal;
|
return sig;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
signal_free(DBus_Signal *signal)
|
signal_free(DBus_Signal *sig)
|
||||||
{
|
{
|
||||||
DBus_Arg *arg;
|
DBus_Arg *arg;
|
||||||
Eina_Inlist *inlist;
|
Eina_Inlist *inlist;
|
||||||
|
|
||||||
EINA_INLIST_FOREACH_SAFE(signal->args, inlist, arg)
|
EINA_INLIST_FOREACH_SAFE(sig->args, inlist, arg)
|
||||||
arg_free(arg);
|
arg_free(arg);
|
||||||
signal->iface->signals = eina_inlist_remove(signal->iface->signals,
|
sig->iface->signals = eina_inlist_remove(sig->iface->signals,
|
||||||
EINA_INLIST_GET(signal));
|
EINA_INLIST_GET(sig));
|
||||||
free(signal->c_name);
|
free(sig->c_name);
|
||||||
free(signal->struct_name);
|
free(sig->struct_name);
|
||||||
free(signal->free_function);
|
free(sig->free_function);
|
||||||
free(signal->cb_name);
|
free(sig->cb_name);
|
||||||
free(signal->name);
|
free(sig->name);
|
||||||
free(signal->signal_event);
|
free(sig->signal_event);
|
||||||
free(signal);
|
free(sig);
|
||||||
}
|
}
|
||||||
|
|
||||||
DBus_Interface *
|
DBus_Interface *
|
||||||
|
@ -103,9 +103,9 @@ interface_free(DBus_Interface *iface)
|
||||||
{
|
{
|
||||||
while (iface->signals)
|
while (iface->signals)
|
||||||
{
|
{
|
||||||
DBus_Signal *signal = EINA_INLIST_CONTAINER_GET(iface->signals,
|
DBus_Signal *sig = EINA_INLIST_CONTAINER_GET(iface->signals,
|
||||||
DBus_Signal);
|
DBus_Signal);
|
||||||
signal_free(signal);
|
signal_free(sig);
|
||||||
}
|
}
|
||||||
while (iface->methods)
|
while (iface->methods)
|
||||||
{
|
{
|
||||||
|
|
|
@ -850,13 +850,13 @@ _parse_parts(Evas_Object *ed)
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_write_program_emit(const char *apiname, const char *source, const char *signal,
|
_write_program_emit(const char *apiname, const char *source, const char *sig,
|
||||||
const char *description)
|
const char *description)
|
||||||
{
|
{
|
||||||
char buf[512];
|
char buf[512];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_EMIT, prefix,
|
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_EMIT, prefix,
|
||||||
apiname, signal, source);
|
apiname, sig, source);
|
||||||
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
@ -880,18 +880,18 @@ _write_program_emit(const char *apiname, const char *source, const char *signal,
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_write_program_add(const char *apiname, const char *source, const char *signal,
|
_write_program_add(const char *apiname, const char *source, const char *sig,
|
||||||
const char *description)
|
const char *description)
|
||||||
{
|
{
|
||||||
char buf[512];
|
char buf[512];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_ADD, prefix,
|
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_ADD, prefix,
|
||||||
apiname, signal, source);
|
apiname, sig, source);
|
||||||
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_DEL, prefix,
|
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_DEL, prefix,
|
||||||
apiname, signal, source);
|
apiname, sig, source);
|
||||||
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
@ -937,7 +937,7 @@ _parse_programs(Evas_Object *ed)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = EINA_TRUE;
|
Eina_Bool ret = EINA_TRUE;
|
||||||
Eina_List *programs, *l;
|
Eina_List *programs, *l;
|
||||||
const char *name, *source = NULL, *signal = NULL, *description;
|
const char *name, *source = NULL, *sig = NULL, *description;
|
||||||
char *apiname;
|
char *apiname;
|
||||||
Edje_Action_Type type;
|
Edje_Action_Type type;
|
||||||
|
|
||||||
|
@ -970,8 +970,8 @@ _parse_programs(Evas_Object *ed)
|
||||||
edje_edit_string_free(str2);
|
edje_edit_string_free(str2);
|
||||||
}
|
}
|
||||||
|
|
||||||
signal = edje_edit_program_signal_get(ed, name);
|
sig = edje_edit_program_signal_get(ed, name);
|
||||||
if (!signal)
|
if (!sig)
|
||||||
{
|
{
|
||||||
free(apiname);
|
free(apiname);
|
||||||
edje_edit_string_free(description);
|
edje_edit_string_free(description);
|
||||||
|
@ -982,19 +982,19 @@ _parse_programs(Evas_Object *ed)
|
||||||
if (!source)
|
if (!source)
|
||||||
{
|
{
|
||||||
free(apiname);
|
free(apiname);
|
||||||
edje_edit_string_free(signal);
|
edje_edit_string_free(sig);
|
||||||
edje_edit_string_free(description);
|
edje_edit_string_free(description);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_write_program_emit(apiname, source, signal, description))
|
if (!_write_program_emit(apiname, source, sig, description))
|
||||||
{
|
{
|
||||||
ret = EINA_FALSE;
|
ret = EINA_FALSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
edje_edit_string_free(description);
|
edje_edit_string_free(description);
|
||||||
edje_edit_string_free(signal);
|
edje_edit_string_free(sig);
|
||||||
edje_edit_string_free(source);
|
edje_edit_string_free(source);
|
||||||
free(apiname);
|
free(apiname);
|
||||||
}
|
}
|
||||||
|
@ -1003,7 +1003,7 @@ _parse_programs(Evas_Object *ed)
|
||||||
if (!ret)
|
if (!ret)
|
||||||
{
|
{
|
||||||
edje_edit_string_free(description);
|
edje_edit_string_free(description);
|
||||||
edje_edit_string_free(signal);
|
edje_edit_string_free(sig);
|
||||||
edje_edit_string_free(source);
|
edje_edit_string_free(source);
|
||||||
free(apiname);
|
free(apiname);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue