DBus_Signal *
signal_new(DBus_Interface *iface)
{
- DBus_Signal *signal = calloc(1, sizeof(DBus_Signal));
- EINA_SAFETY_ON_NULL_RETURN_VAL(signal, NULL);
- iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(signal));
- signal->iface = iface;
- return signal;
+ DBus_Signal *sig = calloc(1, sizeof(DBus_Signal));
+ EINA_SAFETY_ON_NULL_RETURN_VAL(sig, NULL);
+ iface->signals = eina_inlist_append(iface->signals, EINA_INLIST_GET(sig));
+ sig->iface = iface;
+ return sig;
}
void
-signal_free(DBus_Signal *signal)
+signal_free(DBus_Signal *sig)
{
DBus_Arg *arg;
Eina_Inlist *inlist;
- EINA_INLIST_FOREACH_SAFE(signal->args, inlist, arg)
+ EINA_INLIST_FOREACH_SAFE(sig->args, inlist, arg)
arg_free(arg);
- signal->iface->signals = eina_inlist_remove(signal->iface->signals,
- EINA_INLIST_GET(signal));
- free(signal->c_name);
- free(signal->struct_name);
- free(signal->free_function);
- free(signal->cb_name);
- free(signal->name);
- free(signal->signal_event);
- free(signal);
+ sig->iface->signals = eina_inlist_remove(sig->iface->signals,
+ EINA_INLIST_GET(sig));
+ free(sig->c_name);
+ free(sig->struct_name);
+ free(sig->free_function);
+ free(sig->cb_name);
+ free(sig->name);
+ free(sig->signal_event);
+ free(sig);
}
DBus_Interface *
{
while (iface->signals)
{
- DBus_Signal *signal = EINA_INLIST_CONTAINER_GET(iface->signals,
+ DBus_Signal *sig = EINA_INLIST_CONTAINER_GET(iface->signals,
DBus_Signal);
- signal_free(signal);
+ signal_free(sig);
}
while (iface->methods)
{
}
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)
{
char buf[512];
snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_EMIT, prefix,
- apiname, signal, source);
+ apiname, sig, source);
if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
goto err;
}
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)
{
char buf[512];
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)
goto err;
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)
goto err;
{
Eina_Bool ret = EINA_TRUE;
Eina_List *programs, *l;
- const char *name, *source = NULL, *signal = NULL, *description;
+ const char *name, *source = NULL, *sig = NULL, *description;
char *apiname;
Edje_Action_Type type;
edje_edit_string_free(str2);
}
- signal = edje_edit_program_signal_get(ed, name);
- if (!signal)
+ sig = edje_edit_program_signal_get(ed, name);
+ if (!sig)
{
free(apiname);
edje_edit_string_free(description);
if (!source)
{
free(apiname);
- edje_edit_string_free(signal);
+ edje_edit_string_free(sig);
edje_edit_string_free(description);
continue;
}
- if (!_write_program_emit(apiname, source, signal, description))
+ if (!_write_program_emit(apiname, source, sig, description))
{
ret = EINA_FALSE;
break;
}
edje_edit_string_free(description);
- edje_edit_string_free(signal);
+ edje_edit_string_free(sig);
edje_edit_string_free(source);
free(apiname);
}
if (!ret)
{
edje_edit_string_free(description);
- edje_edit_string_free(signal);
+ edje_edit_string_free(sig);
edje_edit_string_free(source);
free(apiname);
}