forked from enlightenment/efl
efl: formatting
This commit is contained in:
parent
b1c97a0da4
commit
336f6ec328
|
@ -1039,7 +1039,7 @@ part_description_image_cleanup(Edje_Part *ep)
|
||||||
unsigned int j;
|
unsigned int j;
|
||||||
|
|
||||||
if (ep->type != EDJE_PART_TYPE_IMAGE)
|
if (ep->type != EDJE_PART_TYPE_IMAGE)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
ed = (Edje_Part_Description_Image*) ep->default_desc;
|
ed = (Edje_Part_Description_Image*) ep->default_desc;
|
||||||
_edje_part_description_image_remove(ed);
|
_edje_part_description_image_remove(ed);
|
||||||
|
|
|
@ -1828,7 +1828,7 @@ data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest)
|
||||||
eina_hash_set(part_dest_lookup, &pl->dest, list);
|
eina_hash_set(part_dest_lookup, &pl->dest, list);
|
||||||
eina_hash_del(part_pc_dest_lookup, &key, pl);
|
eina_hash_del(part_pc_dest_lookup, &key, pl);
|
||||||
}
|
}
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!name[0]) return;
|
if (!name[0]) return;
|
||||||
|
@ -1863,7 +1863,7 @@ data_queue_anonymous_lookup(Edje_Part_Collection *pc, Edje_Program *ep, int *des
|
||||||
Eina_List *l, *l2;
|
Eina_List *l, *l2;
|
||||||
Program_Lookup *pl;
|
Program_Lookup *pl;
|
||||||
|
|
||||||
if (!ep) return ; /* FIXME: should we stop compiling ? */
|
if (!ep) return; /* FIXME: should we stop compiling ? */
|
||||||
|
|
||||||
EINA_LIST_FOREACH(program_lookups, l, pl)
|
EINA_LIST_FOREACH(program_lookups, l, pl)
|
||||||
{
|
{
|
||||||
|
@ -1949,7 +1949,7 @@ data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest)
|
||||||
{
|
{
|
||||||
Program_Lookup *pl;
|
Program_Lookup *pl;
|
||||||
|
|
||||||
if (!name) return ; /* FIXME: should we stop compiling ? */
|
if (!name) return; /* FIXME: should we stop compiling ? */
|
||||||
|
|
||||||
pl = mem_alloc(SZ(Program_Lookup));
|
pl = mem_alloc(SZ(Program_Lookup));
|
||||||
program_lookups = eina_list_append(program_lookups, pl);
|
program_lookups = eina_list_append(program_lookups, pl);
|
||||||
|
@ -1997,7 +1997,7 @@ data_queue_image_remove(int *dest, Eina_Bool *set)
|
||||||
image_lookups = eina_list_remove_list(image_lookups, l);
|
image_lookups = eina_list_remove_list(image_lookups, l);
|
||||||
free(il->name);
|
free(il->name);
|
||||||
free(il);
|
free(il);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2625,7 +2625,7 @@ using_file(const char *filename, const char type)
|
||||||
|
|
||||||
if (!watchfile) return;
|
if (!watchfile) return;
|
||||||
f = fopen(watchfile, "ab");
|
f = fopen(watchfile, "ab");
|
||||||
if (!f) return ;
|
if (!f) return;
|
||||||
if (anotate)
|
if (anotate)
|
||||||
{
|
{
|
||||||
fprintf(f, "%c: %s\n", type, filename);
|
fprintf(f, "%c: %s\n", type, filename);
|
||||||
|
|
|
@ -190,7 +190,7 @@ _edje_collection_program_add(Edje_Program ***array,
|
||||||
Edje_Program **tmp;
|
Edje_Program **tmp;
|
||||||
|
|
||||||
tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
|
tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
|
||||||
if (!tmp) return ;
|
if (!tmp) return;
|
||||||
|
|
||||||
tmp[(*count)++] = add;
|
tmp[(*count)++] = add;
|
||||||
*array = tmp;
|
*array = tmp;
|
||||||
|
|
|
@ -33,7 +33,7 @@ read_watch_file(const char *file)
|
||||||
Eina_List *r = NULL;
|
Eina_List *r = NULL;
|
||||||
|
|
||||||
f = eina_file_open(file, EINA_FALSE);
|
f = eina_file_open(file, EINA_FALSE);
|
||||||
if (!f) return ;
|
if (!f) return;
|
||||||
|
|
||||||
it = eina_file_map_lines(f);
|
it = eina_file_map_lines(f);
|
||||||
if (!it) goto err;
|
if (!it) goto err;
|
||||||
|
|
|
@ -7448,7 +7448,7 @@ using_file(const char *filename, const char type)
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
f = fopen(options.watchfile, "a");
|
f = fopen(options.watchfile, "a");
|
||||||
if (!f) return ;
|
if (!f) return;
|
||||||
if (anotate)
|
if (anotate)
|
||||||
{
|
{
|
||||||
fprintf(f, "%c: %s\n", type, filename);
|
fprintf(f, "%c: %s\n", type, filename);
|
||||||
|
|
|
@ -81,7 +81,7 @@ ecore_con_mempool_init(void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ERR("Impossible to allocate mempool '%s' !", choice);
|
ERR("Impossible to allocate mempool '%s' !", choice);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -286,11 +286,11 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
|
||||||
if (n->buffer_current + size > n->buffer_length)
|
if (n->buffer_current + size > n->buffer_length)
|
||||||
{
|
{
|
||||||
_ecore_con_eet_reply_cleanup(n);
|
_ecore_con_eet_reply_cleanup(n);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_ecore_con_eet_raw_data_push(n, data, size);
|
_ecore_con_eet_raw_data_push(n, data, size);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
else if (eet_connection_empty(n->econn) && size > (int) (4 * sizeof (unsigned int) + 2))
|
else if (eet_connection_empty(n->econn) && size > (int) (4 * sizeof (unsigned int) + 2))
|
||||||
{
|
{
|
||||||
|
@ -329,7 +329,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
|
||||||
if (n->buffer)
|
if (n->buffer)
|
||||||
{
|
{
|
||||||
_ecore_con_eet_raw_data_push(n, buffer, size);
|
_ecore_con_eet_raw_data_push(n, buffer, size);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
_ecore_con_eet_reply_cleanup(n);
|
_ecore_con_eet_reply_cleanup(n);
|
||||||
|
|
||||||
|
@ -487,7 +487,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_con_eet_server_free(Ecore_Con_Eet *r)
|
ecore_con_eet_server_free(Ecore_Con_Eet *r)
|
||||||
{
|
{
|
||||||
if (!r) return ;
|
if (!r) return;
|
||||||
|
|
||||||
eet_data_descriptor_free(r->edd);
|
eet_data_descriptor_free(r->edd);
|
||||||
eet_data_descriptor_free(r->matching);
|
eet_data_descriptor_free(r->matching);
|
||||||
|
@ -535,7 +535,7 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
|
ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
|
||||||
{
|
{
|
||||||
if (!ece) return ;
|
if (!ece) return;
|
||||||
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(ece->matching, name, edd);
|
EET_DATA_DESCRIPTOR_ADD_MAPPING(ece->matching, name, edd);
|
||||||
}
|
}
|
||||||
|
@ -545,10 +545,10 @@ ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Data *eced;
|
Ecore_Con_Eet_Data *eced;
|
||||||
|
|
||||||
if (!ece) return ;
|
if (!ece) return;
|
||||||
|
|
||||||
eced = calloc(1, sizeof (Ecore_Con_Eet_Data));
|
eced = calloc(1, sizeof (Ecore_Con_Eet_Data));
|
||||||
if (!eced) return ;
|
if (!eced) return;
|
||||||
|
|
||||||
eced->func = func;
|
eced->func = func;
|
||||||
eced->data = data;
|
eced->data = data;
|
||||||
|
@ -560,7 +560,7 @@ ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
|
ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
|
||||||
{
|
{
|
||||||
if (!ece) return ;
|
if (!ece) return;
|
||||||
eina_hash_del(ece->data_callbacks, name, NULL);
|
eina_hash_del(ece->data_callbacks, name, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,10 +569,10 @@ ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Raw_Data *eced;
|
Ecore_Con_Eet_Raw_Data *eced;
|
||||||
|
|
||||||
if (!ece) return ;
|
if (!ece) return;
|
||||||
|
|
||||||
eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data));
|
eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data));
|
||||||
if (!eced) return ;
|
if (!eced) return;
|
||||||
|
|
||||||
eced->func = func;
|
eced->func = func;
|
||||||
eced->data = data;
|
eced->data = data;
|
||||||
|
@ -584,7 +584,7 @@ ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
|
ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
|
||||||
{
|
{
|
||||||
if (!ece) return ;
|
if (!ece) return;
|
||||||
|
|
||||||
if (ece->client && ece->u.client.r->buffer_handler && !strcmp(ece->u.client.r->buffer_handler->name, name))
|
if (ece->client && ece->u.client.r->buffer_handler && !strcmp(ece->u.client.r->buffer_handler->name, name))
|
||||||
{
|
{
|
||||||
|
@ -600,10 +600,10 @@ ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Client *c;
|
Ecore_Con_Eet_Client *c;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
c = calloc(1, sizeof (Ecore_Con_Eet_Client));
|
c = calloc(1, sizeof (Ecore_Con_Eet_Client));
|
||||||
if (!c) return ;
|
if (!c) return;
|
||||||
|
|
||||||
c->func = func;
|
c->func = func;
|
||||||
c->data = data;
|
c->data = data;
|
||||||
|
@ -617,14 +617,14 @@ ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
|
||||||
Ecore_Con_Eet_Client *c;
|
Ecore_Con_Eet_Client *c;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(ece->u.server.client_connect_callbacks, l, c)
|
EINA_LIST_FOREACH(ece->u.server.client_connect_callbacks, l, c)
|
||||||
if (c->func == func && c->data == data)
|
if (c->func == func && c->data == data)
|
||||||
{
|
{
|
||||||
ece->u.server.client_connect_callbacks = eina_list_remove_list(ece->u.server.client_connect_callbacks, l);
|
ece->u.server.client_connect_callbacks = eina_list_remove_list(ece->u.server.client_connect_callbacks, l);
|
||||||
free(c);
|
free(c);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -633,10 +633,10 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Client *c;
|
Ecore_Con_Eet_Client *c;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
c = calloc(1, sizeof (Ecore_Con_Eet_Client));
|
c = calloc(1, sizeof (Ecore_Con_Eet_Client));
|
||||||
if (!c) return ;
|
if (!c) return;
|
||||||
|
|
||||||
c->func = func;
|
c->func = func;
|
||||||
c->data = data;
|
c->data = data;
|
||||||
|
@ -650,7 +650,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
|
||||||
Ecore_Con_Eet_Client *c;
|
Ecore_Con_Eet_Client *c;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(ece->u.server.client_disconnect_callbacks, l, c)
|
EINA_LIST_FOREACH(ece->u.server.client_disconnect_callbacks, l, c)
|
||||||
if (c->func == func && c->data == data)
|
if (c->func == func && c->data == data)
|
||||||
|
@ -658,7 +658,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
|
||||||
ece->u.server.client_disconnect_callbacks = eina_list_remove_list(ece->u.server.client_disconnect_callbacks,
|
ece->u.server.client_disconnect_callbacks = eina_list_remove_list(ece->u.server.client_disconnect_callbacks,
|
||||||
l);
|
l);
|
||||||
free(c);
|
free(c);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -667,10 +667,10 @@ ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Server *s;
|
Ecore_Con_Eet_Server *s;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
s = calloc(1, sizeof (Ecore_Con_Eet_Server));
|
s = calloc(1, sizeof (Ecore_Con_Eet_Server));
|
||||||
if (!s) return ;
|
if (!s) return;
|
||||||
|
|
||||||
s->func = func;
|
s->func = func;
|
||||||
s->data = data;
|
s->data = data;
|
||||||
|
@ -684,14 +684,14 @@ ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
|
||||||
Ecore_Con_Eet_Server *s;
|
Ecore_Con_Eet_Server *s;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(ece->u.client.server_connect_callbacks, l, s)
|
EINA_LIST_FOREACH(ece->u.client.server_connect_callbacks, l, s)
|
||||||
if (s->func == func && s->data == data)
|
if (s->func == func && s->data == data)
|
||||||
{
|
{
|
||||||
ece->u.client.server_connect_callbacks = eina_list_remove_list(ece->u.client.server_connect_callbacks, l);
|
ece->u.client.server_connect_callbacks = eina_list_remove_list(ece->u.client.server_connect_callbacks, l);
|
||||||
free(s);
|
free(s);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -700,10 +700,10 @@ ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Server *s;
|
Ecore_Con_Eet_Server *s;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
s = calloc(1, sizeof (Ecore_Con_Eet_Server));
|
s = calloc(1, sizeof (Ecore_Con_Eet_Server));
|
||||||
if (!s) return ;
|
if (!s) return;
|
||||||
|
|
||||||
s->func = func;
|
s->func = func;
|
||||||
s->data = data;
|
s->data = data;
|
||||||
|
@ -717,14 +717,14 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
|
||||||
Ecore_Con_Eet_Server *s;
|
Ecore_Con_Eet_Server *s;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!ece || !func) return ;
|
if (!ece || !func) return;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(ece->u.client.server_disconnect_callbacks, l, s)
|
EINA_LIST_FOREACH(ece->u.client.server_disconnect_callbacks, l, s)
|
||||||
if (s->func == func && s->data == data)
|
if (s->func == func && s->data == data)
|
||||||
{
|
{
|
||||||
ece->u.client.server_disconnect_callbacks = eina_list_remove_list(ece->u.client.server_disconnect_callbacks, l);
|
ece->u.client.server_disconnect_callbacks = eina_list_remove_list(ece->u.client.server_disconnect_callbacks, l);
|
||||||
free(s);
|
free(s);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -755,7 +755,7 @@ ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
|
||||||
{
|
{
|
||||||
Ecore_Con_Eet_Protocol protocol;
|
Ecore_Con_Eet_Protocol protocol;
|
||||||
|
|
||||||
if (!reply) return ;
|
if (!reply) return;
|
||||||
|
|
||||||
protocol.type = name;
|
protocol.type = name;
|
||||||
protocol.data = value;
|
protocol.data = value;
|
||||||
|
@ -772,12 +772,12 @@ ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const
|
||||||
unsigned int size;
|
unsigned int size;
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
if (!reply) return ;
|
if (!reply) return;
|
||||||
if (!protocol_name) return ;
|
if (!protocol_name) return;
|
||||||
if (!section) return ;
|
if (!section) return;
|
||||||
|
|
||||||
protocol_length = strlen(protocol_name) + 1;
|
protocol_length = strlen(protocol_name) + 1;
|
||||||
if (protocol_length == 1) return ;
|
if (protocol_length == 1) return;
|
||||||
section_length = strlen(section) + 1;
|
section_length = strlen(section) + 1;
|
||||||
|
|
||||||
protocol[0] = htonl(ECORE_CON_EET_RAW_MAGIC);
|
protocol[0] = htonl(ECORE_CON_EET_RAW_MAGIC);
|
||||||
|
|
|
@ -114,10 +114,10 @@ _ecore_event_evas_push_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Pre
|
||||||
{
|
{
|
||||||
Ecore_Event_Last *eel;
|
Ecore_Event_Last *eel;
|
||||||
|
|
||||||
if (!_last_events_enable) return ;
|
if (!_last_events_enable) return;
|
||||||
|
|
||||||
eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, EINA_TRUE);
|
eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, EINA_TRUE);
|
||||||
if (!eel) return ;
|
if (!eel) return;
|
||||||
|
|
||||||
switch (eel->state)
|
switch (eel->state)
|
||||||
{
|
{
|
||||||
|
@ -158,7 +158,7 @@ _ecore_event_evas_push_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Pre
|
||||||
{
|
{
|
||||||
/* Save the Ecore_Event somehow */
|
/* Save the Ecore_Event somehow */
|
||||||
if (!eel->ev) eel->ev = malloc(sizeof (Ecore_Event_Mouse_Button));
|
if (!eel->ev) eel->ev = malloc(sizeof (Ecore_Event_Mouse_Button));
|
||||||
if (!eel->ev) return ;
|
if (!eel->ev) return;
|
||||||
memcpy(eel->ev, e, sizeof (Ecore_Event_Mouse_Button));
|
memcpy(eel->ev, e, sizeof (Ecore_Event_Mouse_Button));
|
||||||
eel->timer = ecore_timer_add(_last_events_timeout, _ecore_event_evas_push_fake, eel);
|
eel->timer = ecore_timer_add(_last_events_timeout, _ecore_event_evas_push_fake, eel);
|
||||||
}
|
}
|
||||||
|
@ -176,7 +176,7 @@ _ecore_event_evas_push_mouse_move(Ecore_Event_Mouse_Move *e)
|
||||||
Ecore_Event_Last *eel;
|
Ecore_Event_Last *eel;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!_last_events_enable) return ;
|
if (!_last_events_enable) return;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(_last_events, l, eel)
|
EINA_LIST_FOREACH(_last_events, l, eel)
|
||||||
switch (eel->state)
|
switch (eel->state)
|
||||||
|
|
|
@ -166,7 +166,7 @@ ecore_sdl_feed_events(void)
|
||||||
Ecore_Event_Mouse_Move *ev;
|
Ecore_Event_Mouse_Move *ev;
|
||||||
|
|
||||||
ev = malloc(sizeof(Ecore_Event_Mouse_Move));
|
ev = malloc(sizeof(Ecore_Event_Mouse_Move));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
ev->timestamp = timestamp;
|
ev->timestamp = timestamp;
|
||||||
ev->window = 0;
|
ev->window = 0;
|
||||||
|
@ -194,7 +194,7 @@ ecore_sdl_feed_events(void)
|
||||||
Ecore_Event_Mouse_Wheel *ev;
|
Ecore_Event_Mouse_Wheel *ev;
|
||||||
|
|
||||||
ev = malloc(sizeof(Ecore_Event_Mouse_Wheel));
|
ev = malloc(sizeof(Ecore_Event_Mouse_Wheel));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
ev->timestamp = timestamp;
|
ev->timestamp = timestamp;
|
||||||
ev->window = 0;
|
ev->window = 0;
|
||||||
|
@ -210,7 +210,7 @@ ecore_sdl_feed_events(void)
|
||||||
Ecore_Event_Mouse_Button *ev;
|
Ecore_Event_Mouse_Button *ev;
|
||||||
|
|
||||||
ev = malloc(sizeof(Ecore_Event_Mouse_Button));
|
ev = malloc(sizeof(Ecore_Event_Mouse_Button));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
ev->timestamp = timestamp;
|
ev->timestamp = timestamp;
|
||||||
ev->window = 0;
|
ev->window = 0;
|
||||||
|
@ -235,7 +235,7 @@ ecore_sdl_feed_events(void)
|
||||||
Ecore_Event_Mouse_Button *ev;
|
Ecore_Event_Mouse_Button *ev;
|
||||||
|
|
||||||
ev = malloc(sizeof(Ecore_Event_Mouse_Button));
|
ev = malloc(sizeof(Ecore_Event_Mouse_Button));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
ev->timestamp = timestamp;
|
ev->timestamp = timestamp;
|
||||||
ev->window = 0;
|
ev->window = 0;
|
||||||
ev->event_window = 0;
|
ev->event_window = 0;
|
||||||
|
|
|
@ -102,10 +102,10 @@ _edje_programs_patterns_init(Edje_Part_Collection *edc)
|
||||||
+ edc->programs.strrncmp_count
|
+ edc->programs.strrncmp_count
|
||||||
+ edc->programs.fnmatch_count
|
+ edc->programs.fnmatch_count
|
||||||
+ edc->programs.nocmp_count;
|
+ edc->programs.nocmp_count;
|
||||||
if (j == 0) return ;
|
if (j == 0) return;
|
||||||
|
|
||||||
all = malloc(sizeof (Edje_Program *) * j);
|
all = malloc(sizeof (Edje_Program *) * j);
|
||||||
if (!all) return ;
|
if (!all) return;
|
||||||
j = 0;
|
j = 0;
|
||||||
|
|
||||||
/* FIXME: Build specialized data type for each case */
|
/* FIXME: Build specialized data type for each case */
|
||||||
|
|
|
@ -694,7 +694,7 @@ _edje_recalc_do(Edje *ed)
|
||||||
eo_do(ed->obj, evas_obj_size_hint_min_set(w, h));
|
eo_do(ed->obj, evas_obj_size_hint_min_set(w, h));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ed->collection) return ;
|
if (!ed->collection) return;
|
||||||
|
|
||||||
for (i = 0; i < ed->collection->limits.parts_count; i++)
|
for (i = 0; i < ed->collection->limits.parts_count; i++)
|
||||||
{
|
{
|
||||||
|
@ -818,7 +818,7 @@ void
|
||||||
_edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
|
_edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
|
||||||
{
|
{
|
||||||
/* check whether this part is dragable at all */
|
/* check whether this part is dragable at all */
|
||||||
if (!ep->drag) return ;
|
if (!ep->drag) return;
|
||||||
|
|
||||||
/* instead of checking for equality, we really should check that
|
/* instead of checking for equality, we really should check that
|
||||||
* the difference is greater than foo, but I have no idea what
|
* the difference is greater than foo, but I have no idea what
|
||||||
|
@ -2076,7 +2076,7 @@ _edje_part_recalc_single_map(Edje *ed,
|
||||||
params->lighted = params->mapped ? !!light : 0;
|
params->lighted = params->mapped ? !!light : 0;
|
||||||
params->persp_on = params->mapped ? !!persp : 0;
|
params->persp_on = params->mapped ? !!persp : 0;
|
||||||
|
|
||||||
if (!params->mapped) return ;
|
if (!params->mapped) return;
|
||||||
|
|
||||||
EINA_COW_CALC_MAP_BEGIN(params, params_write)
|
EINA_COW_CALC_MAP_BEGIN(params, params_write)
|
||||||
{
|
{
|
||||||
|
@ -3023,7 +3023,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
|
||||||
|
|
||||||
#ifdef EDJE_CALC_CACHE
|
#ifdef EDJE_CALC_CACHE
|
||||||
if (ep->state == ed->state && !state)
|
if (ep->state == ed->state && !state)
|
||||||
return ;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (ep->param1.description->rel1.id_x >= 0)
|
if (ep->param1.description->rel1.id_x >= 0)
|
||||||
|
|
|
@ -244,7 +244,7 @@ _edje_collection_program_add(Edje_Program ***array,
|
||||||
Edje_Program **tmp;
|
Edje_Program **tmp;
|
||||||
|
|
||||||
tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
|
tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
|
||||||
if (!tmp) return ;
|
if (!tmp) return;
|
||||||
|
|
||||||
tmp[(*count)++] = add;
|
tmp[(*count)++] = add;
|
||||||
*array = tmp;
|
*array = tmp;
|
||||||
|
|
|
@ -2682,7 +2682,7 @@ edje_edit_part_drag_x_set(Evas_Object *obj, const char *part, int drag)
|
||||||
{
|
{
|
||||||
free(rp->drag);
|
free(rp->drag);
|
||||||
rp->drag = NULL;
|
rp->drag = NULL;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rp->drag) return;
|
if (rp->drag) return;
|
||||||
|
@ -2717,7 +2717,7 @@ edje_edit_part_drag_y_set(Evas_Object *obj, const char *part, int drag)
|
||||||
{
|
{
|
||||||
free(rp->drag);
|
free(rp->drag);
|
||||||
rp->drag = NULL;
|
rp->drag = NULL;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rp->drag) return;
|
if (rp->drag) return;
|
||||||
|
@ -2777,7 +2777,7 @@ FUNC_PART_DRAG_INT(count, y);
|
||||||
if (!e) \
|
if (!e) \
|
||||||
{ \
|
{ \
|
||||||
rp->part->dragable.Id##_id = -1; \
|
rp->part->dragable.Id##_id = -1; \
|
||||||
return ; \
|
return; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
e_part = _edje_real_part_get(ed, e); \
|
e_part = _edje_real_part_get(ed, e); \
|
||||||
|
|
|
@ -111,7 +111,7 @@ _edje_entry_focus_in_cb(void *data, Evas_Object *o, const char *emission EINA_UN
|
||||||
if (!rp->typedata.text->entry_data) return;
|
if (!rp->typedata.text->entry_data) return;
|
||||||
|
|
||||||
ed = _edje_fetch(o);
|
ed = _edje_fetch(o);
|
||||||
if (ed) return ;
|
if (ed) return;
|
||||||
|
|
||||||
en = rp->typedata.text->entry_data;
|
en = rp->typedata.text->entry_data;
|
||||||
if (!en || !en->imf_context) return;
|
if (!en || !en->imf_context) return;
|
||||||
|
|
|
@ -727,7 +727,7 @@ edje_match_callback_exec(const Edje_Signals_Sources_Patterns *ssp,
|
||||||
void
|
void
|
||||||
edje_match_patterns_free(Edje_Patterns *ppat)
|
edje_match_patterns_free(Edje_Patterns *ppat)
|
||||||
{
|
{
|
||||||
if (!ppat) return ;
|
if (!ppat) return;
|
||||||
|
|
||||||
ppat->delete_me = EINA_TRUE;
|
ppat->delete_me = EINA_TRUE;
|
||||||
ppat->ref--;
|
ppat->ref--;
|
||||||
|
|
|
@ -96,11 +96,11 @@ _edje_callbacks_patterns_init(Edje_Signal_Callback_Group *gp)
|
||||||
Edje_Signals_Sources_Patterns *ssp;
|
Edje_Signals_Sources_Patterns *ssp;
|
||||||
Edje_Signal_Callback_Matches *tmp;
|
Edje_Signal_Callback_Matches *tmp;
|
||||||
|
|
||||||
if (gp->matches->patterns) return ;
|
if (gp->matches->patterns) return;
|
||||||
|
|
||||||
tmp = (Edje_Signal_Callback_Matches*) gp->matches;
|
tmp = (Edje_Signal_Callback_Matches*) gp->matches;
|
||||||
tmp->patterns = calloc(1, sizeof (Edje_Signals_Sources_Patterns));
|
tmp->patterns = calloc(1, sizeof (Edje_Signals_Sources_Patterns));
|
||||||
if (!gp->matches->patterns) return ;
|
if (!gp->matches->patterns) return;
|
||||||
|
|
||||||
ssp = gp->matches->patterns;
|
ssp = gp->matches->patterns;
|
||||||
edje_match_callback_hash_build(gp->matches->matches,
|
edje_match_callback_hash_build(gp->matches->matches,
|
||||||
|
@ -211,7 +211,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
|
||||||
_edje_signal_callback_set(gp, i,
|
_edje_signal_callback_set(gp, i,
|
||||||
sig, src, func, data,
|
sig, src, func, data,
|
||||||
(((!!propagate) & 1) | _JUST_ADDED));
|
(((!!propagate) & 1) | _JUST_ADDED));
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,7 +229,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
|
||||||
{
|
{
|
||||||
Edje_Signal_Callback_Matches *tmp_dup;
|
Edje_Signal_Callback_Matches *tmp_dup;
|
||||||
tmp_dup = (Edje_Signal_Callback_Matches*) _edje_signal_callback_matches_dup(tmp);
|
tmp_dup = (Edje_Signal_Callback_Matches*) _edje_signal_callback_matches_dup(tmp);
|
||||||
if (!tmp_dup) return ;
|
if (!tmp_dup) return;
|
||||||
EINA_REFCOUNT_UNREF(tmp)
|
EINA_REFCOUNT_UNREF(tmp)
|
||||||
(void) 0; // Nothing to do because the case where refcount == 1 was already handle above.
|
(void) 0; // Nothing to do because the case where refcount == 1 was already handle above.
|
||||||
gp->matches = tmp_dup;
|
gp->matches = tmp_dup;
|
||||||
|
@ -246,7 +246,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
|
||||||
_edje_signal_callback_set(gp, i,
|
_edje_signal_callback_set(gp, i,
|
||||||
sig, src, func, data,
|
sig, src, func, data,
|
||||||
(((!!propagate) & 1) | _JUST_ADDED));
|
(((!!propagate) & 1) | _JUST_ADDED));
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
if (gp->flags[i >> 1] & (_DELETE_ME << 4))
|
if (gp->flags[i >> 1] & (_DELETE_ME << 4))
|
||||||
{
|
{
|
||||||
|
@ -254,7 +254,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
|
||||||
_edje_signal_callback_set(gp, i + 1,
|
_edje_signal_callback_set(gp, i + 1,
|
||||||
sig, src, func, data,
|
sig, src, func, data,
|
||||||
(((!!propagate) & 1) | _JUST_ADDED));
|
(((!!propagate) & 1) | _JUST_ADDED));
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -264,7 +264,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
|
||||||
_edje_signal_callback_set(gp, gp->matches->matches_count - 1,
|
_edje_signal_callback_set(gp, gp->matches->matches_count - 1,
|
||||||
sig, src, func, data, (((!!propagate) & 1) | _JUST_ADDED));
|
sig, src, func, data, (((!!propagate) & 1) | _JUST_ADDED));
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Edje_Signal_Callback_Group *
|
const Edje_Signal_Callback_Group *
|
||||||
|
@ -316,7 +316,7 @@ _edje_signal_callback_free(const Edje_Signal_Callback_Group *cgp)
|
||||||
{
|
{
|
||||||
Edje_Signal_Callback_Group *gp = (Edje_Signal_Callback_Group*) cgp;
|
Edje_Signal_Callback_Group *gp = (Edje_Signal_Callback_Group*) cgp;
|
||||||
|
|
||||||
if (!gp) return ;
|
if (!gp) return;
|
||||||
|
|
||||||
_edje_signal_callback_matches_unref((Edje_Signal_Callback_Matches*) gp->matches);
|
_edje_signal_callback_matches_unref((Edje_Signal_Callback_Matches*) gp->matches);
|
||||||
gp->matches = NULL;
|
gp->matches = NULL;
|
||||||
|
@ -389,7 +389,7 @@ _edje_signal_callback_move_last(Edje_Signal_Callback_Group *gp,
|
||||||
m->matches[i].func = m->matches[j].func;
|
m->matches[i].func = m->matches[j].func;
|
||||||
gp->flags[i] = (gp->flags[i >> 1] & (0xF << (((i & 1) ^ 1) * 4))) |
|
gp->flags[i] = (gp->flags[i >> 1] & (0xF << (((i & 1) ^ 1) * 4))) |
|
||||||
(gp->flags[j >> 1] & (0xF << (((j & 1) * 4))));
|
(gp->flags[j >> 1] & (0xF << (((j & 1) * 4))));
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
--m->matches_count;
|
--m->matches_count;
|
||||||
}
|
}
|
||||||
|
@ -460,7 +460,7 @@ _edje_signal_callback_patterns_unref(const Edje_Signals_Sources_Patterns *essp)
|
||||||
{
|
{
|
||||||
Edje_Signals_Sources_Patterns *ssp;
|
Edje_Signals_Sources_Patterns *ssp;
|
||||||
|
|
||||||
if (!essp) return ;
|
if (!essp) return;
|
||||||
|
|
||||||
ssp = (Edje_Signals_Sources_Patterns*) essp;
|
ssp = (Edje_Signals_Sources_Patterns*) essp;
|
||||||
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ _edje_limit_emit(Edje *ed, const char *limit_name, Eina_Bool over)
|
||||||
char *buffer;
|
char *buffer;
|
||||||
unsigned int length;
|
unsigned int length;
|
||||||
|
|
||||||
if (!limit_name) return ;
|
if (!limit_name) return;
|
||||||
|
|
||||||
length = strlen(limit_name) + 13;
|
length = strlen(limit_name) + 13;
|
||||||
buffer = alloca(length);
|
buffer = alloca(length);
|
||||||
|
@ -225,7 +225,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (size_next == size_current) return ;
|
if (size_next == size_current) return;
|
||||||
|
|
||||||
for (i = 0; i < length; ++i)
|
for (i = 0; i < length; ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -63,7 +63,7 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
|
||||||
if (!pt) return;
|
if (!pt) return;
|
||||||
if (pt->type != EDJE_PART_TYPE_TEXT
|
if (pt->type != EDJE_PART_TYPE_TEXT
|
||||||
&& pt->type != EDJE_PART_TYPE_TEXTBLOCK)
|
&& pt->type != EDJE_PART_TYPE_TEXTBLOCK)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
desc = (Edje_Part_Description_Text *) pt->default_desc;
|
desc = (Edje_Part_Description_Text *) pt->default_desc;
|
||||||
if ((pt->default_desc) && (desc->text.text_class))
|
if ((pt->default_desc) && (desc->text.text_class))
|
||||||
|
|
|
@ -166,7 +166,7 @@ _edje_class_member_add(Edje *ed, Eina_Hash **ehash, Eina_Hash **ghash, const cha
|
||||||
}
|
}
|
||||||
|
|
||||||
lookup = malloc(sizeof (Edje_List_Refcount));
|
lookup = malloc(sizeof (Edje_List_Refcount));
|
||||||
if (!lookup) return ;
|
if (!lookup) return;
|
||||||
EINA_REFCOUNT_INIT(lookup);
|
EINA_REFCOUNT_INIT(lookup);
|
||||||
|
|
||||||
/* Get members list */
|
/* Get members list */
|
||||||
|
@ -197,7 +197,7 @@ _edje_class_member_del(Eina_Hash **ehash, Eina_Hash **ghash, const char *class)
|
||||||
if (!members) return;
|
if (!members) return;
|
||||||
|
|
||||||
lookup = eina_hash_find(*ehash, class);
|
lookup = eina_hash_find(*ehash, class);
|
||||||
if (!lookup) return ;
|
if (!lookup) return;
|
||||||
|
|
||||||
EINA_REFCOUNT_UNREF(lookup)
|
EINA_REFCOUNT_UNREF(lookup)
|
||||||
{
|
{
|
||||||
|
@ -1457,14 +1457,14 @@ _edje_user_define_string(Edje *ed, const char *part, const char *raw_text)
|
||||||
if (!raw_text)
|
if (!raw_text)
|
||||||
{
|
{
|
||||||
_edje_user_definition_free(eud);
|
_edje_user_definition_free(eud);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
eud->u.string.text = raw_text;
|
eud->u.string.text = raw_text;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
eud = _edje_user_definition_new(EDJE_USER_STRING, part, ed);
|
eud = _edje_user_definition_new(EDJE_USER_STRING, part, ed);
|
||||||
if (!eud) return ;
|
if (!eud) return;
|
||||||
eud->u.string.text = raw_text;
|
eud->u.string.text = raw_text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3740,7 +3740,7 @@ _part_unswallow(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
||||||
if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow)
|
if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow)
|
||||||
{
|
{
|
||||||
_edje_user_definition_free(eud);
|
_edje_user_definition_free(eud);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5780,8 +5780,8 @@ _update_hints_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
||||||
Eina_Bool update = va_arg(*list, int);
|
Eina_Bool update = va_arg(*list, int);
|
||||||
Edje *ed = _pd;
|
Edje *ed = _pd;
|
||||||
|
|
||||||
if (!ed) return ;
|
if (!ed) return;
|
||||||
if (ed->update_hints == !!update) return ;
|
if (ed->update_hints == !!update) return;
|
||||||
|
|
||||||
ed->update_hints = !!update;
|
ed->update_hints = !!update;
|
||||||
if (update)
|
if (update)
|
||||||
|
|
|
@ -1958,30 +1958,30 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
|
||||||
type >= EET_T_LAST)
|
type >= EET_T_LAST)
|
||||||
{
|
{
|
||||||
CRIT("Preventing later bug due to unknow type: %i", type);
|
CRIT("Preventing later bug due to unknow type: %i", type);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
if (offset < 0)
|
if (offset < 0)
|
||||||
{
|
{
|
||||||
CRIT("Preventing later buffer underrun : offset = %i", offset);
|
CRIT("Preventing later buffer underrun : offset = %i", offset);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
if (offset > edd->size)
|
if (offset > edd->size)
|
||||||
{
|
{
|
||||||
CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
|
CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW)
|
if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW)
|
||||||
{
|
{
|
||||||
if (offset + eet_basic_codec[type - 1].size > edd->size)
|
if (offset + eet_basic_codec[type - 1].size > edd->size)
|
||||||
{
|
{
|
||||||
CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
|
CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((offset + sizeof (void*)) > (unsigned int) edd->size)
|
else if ((offset + sizeof (void*)) > (unsigned int) edd->size)
|
||||||
{
|
{
|
||||||
CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
|
CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* UNION, VARIANT type would not work with simple type, we need a way to map the type. */
|
/* UNION, VARIANT type would not work with simple type, we need a way to map the type. */
|
||||||
|
|
|
@ -836,7 +836,7 @@ efreet_mime_mime_types_load(const char *file)
|
||||||
|
|
||||||
EINA_SAFETY_ON_NULL_RETURN(file);
|
EINA_SAFETY_ON_NULL_RETURN(file);
|
||||||
f = eina_file_open(file, 0);
|
f = eina_file_open(file, 0);
|
||||||
if (!f) return ;
|
if (!f) return;
|
||||||
|
|
||||||
it = eina_file_map_lines(f);
|
it = eina_file_map_lines(f);
|
||||||
if (it)
|
if (it)
|
||||||
|
|
|
@ -135,7 +135,7 @@ eina_accessor_over(Eina_Accessor *accessor,
|
||||||
void *data;
|
void *data;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (!accessor) return ;
|
if (!accessor) return;
|
||||||
|
|
||||||
EINA_MAGIC_CHECK_ACCESSOR(accessor);
|
EINA_MAGIC_CHECK_ACCESSOR(accessor);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(accessor->get_container);
|
EINA_SAFETY_ON_NULL_RETURN(accessor->get_container);
|
||||||
|
@ -144,7 +144,7 @@ eina_accessor_over(Eina_Accessor *accessor,
|
||||||
EINA_SAFETY_ON_FALSE_RETURN(start < end);
|
EINA_SAFETY_ON_FALSE_RETURN(start < end);
|
||||||
|
|
||||||
if (!eina_accessor_lock(accessor))
|
if (!eina_accessor_lock(accessor))
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
container = accessor->get_container(accessor);
|
container = accessor->get_container(accessor);
|
||||||
for (i = start; i < end && accessor->get_at(accessor, i, &data) == EINA_TRUE;
|
for (i = start; i < end && accessor->get_at(accessor, i, &data) == EINA_TRUE;
|
||||||
|
|
|
@ -309,7 +309,7 @@ eina_array_step_set(Eina_Array *array,
|
||||||
(int) sizeof (Eina_Array));
|
(int) sizeof (Eina_Array));
|
||||||
/* Force memory to zero to provide a small layer of security */
|
/* Force memory to zero to provide a small layer of security */
|
||||||
memset(array, 0, sizeof_eina_array);
|
memset(array, 0, sizeof_eina_array);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
array->version = EINA_ARRAY_VERSION;
|
array->version = EINA_ARRAY_VERSION;
|
||||||
|
|
|
@ -203,7 +203,7 @@ _eina_cow_hash_del(Eina_Cow *cow,
|
||||||
Eina_Cow_Ptr *ref)
|
Eina_Cow_Ptr *ref)
|
||||||
{
|
{
|
||||||
/* eina_cow_gc is not supposed to be thread safe */
|
/* eina_cow_gc is not supposed to be thread safe */
|
||||||
if (!ref->hashed) return ;
|
if (!ref->hashed) return;
|
||||||
|
|
||||||
current_cow_size = cow->struct_size;
|
current_cow_size = cow->struct_size;
|
||||||
eina_hash_del(cow->match, data, data);
|
eina_hash_del(cow->match, data, data);
|
||||||
|
@ -220,7 +220,7 @@ static inline void
|
||||||
_eina_cow_togc_del(Eina_Cow *cow, Eina_Cow_Ptr *ref)
|
_eina_cow_togc_del(Eina_Cow *cow, Eina_Cow_Ptr *ref)
|
||||||
{
|
{
|
||||||
/* eina_cow_gc is not supposed to be thread safe */
|
/* eina_cow_gc is not supposed to be thread safe */
|
||||||
if (!ref->togc) return ;
|
if (!ref->togc) return;
|
||||||
eina_hash_del(cow->togc, &ref, NULL);
|
eina_hash_del(cow->togc, &ref, NULL);
|
||||||
ref->togc = EINA_FALSE;
|
ref->togc = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -233,13 +233,13 @@ _eina_cow_togc_add(Eina_Cow *cow,
|
||||||
Eina_Cow_GC *gc;
|
Eina_Cow_GC *gc;
|
||||||
|
|
||||||
/* needed if we want to make cow gc safe */
|
/* needed if we want to make cow gc safe */
|
||||||
if (ref->togc) return ;
|
if (ref->togc) return;
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gc = eina_mempool_malloc(gc_pool, sizeof (Eina_Cow_GC));
|
gc = eina_mempool_malloc(gc_pool, sizeof (Eina_Cow_GC));
|
||||||
if (!gc) return ; /* That one will not get gced this time */
|
if (!gc) return; /* That one will not get gced this time */
|
||||||
|
|
||||||
gc->ref = ref;
|
gc->ref = ref;
|
||||||
gc->dst = dst;
|
gc->dst = dst;
|
||||||
|
@ -390,7 +390,7 @@ eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, cons
|
||||||
EAPI void
|
EAPI void
|
||||||
eina_cow_del(Eina_Cow *cow)
|
eina_cow_del(Eina_Cow *cow)
|
||||||
{
|
{
|
||||||
if (!cow) return ;
|
if (!cow) return;
|
||||||
|
|
||||||
#ifdef EINA_COW_MAGIC_ON
|
#ifdef EINA_COW_MAGIC_ON
|
||||||
EINA_COW_MAGIC_CHECK(cow);
|
EINA_COW_MAGIC_CHECK(cow);
|
||||||
|
@ -421,8 +421,8 @@ eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data *data)
|
||||||
EINA_COW_MAGIC_CHECK(cow);
|
EINA_COW_MAGIC_CHECK(cow);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!data) return ;
|
if (!data) return;
|
||||||
if (cow->default_value == data) return ;
|
if (cow->default_value == data) return;
|
||||||
|
|
||||||
ref = EINA_COW_PTR_GET(data);
|
ref = EINA_COW_PTR_GET(data);
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
|
@ -435,7 +435,7 @@ eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data *data)
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
||||||
#endif
|
#endif
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef EINA_COW_MAGIC_ON
|
#ifdef EINA_COW_MAGIC_ON
|
||||||
|
@ -552,7 +552,7 @@ eina_cow_done(Eina_Cow *cow,
|
||||||
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!cow->togc || !needed_gc) return ;
|
if (!cow->togc || !needed_gc) return;
|
||||||
|
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (*ref));
|
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (*ref));
|
||||||
|
@ -570,7 +570,7 @@ eina_cow_memcpy(Eina_Cow *cow,
|
||||||
|
|
||||||
EINA_COW_MAGIC_CHECK(cow);
|
EINA_COW_MAGIC_CHECK(cow);
|
||||||
|
|
||||||
if (*dst == src) return ;
|
if (*dst == src) return;
|
||||||
|
|
||||||
if (src != cow->default_value)
|
if (src != cow->default_value)
|
||||||
{
|
{
|
||||||
|
|
|
@ -167,7 +167,7 @@ eina_file_close(Eina_File *file)
|
||||||
eina_lock_take(&file->lock);
|
eina_lock_take(&file->lock);
|
||||||
file->refcount--;
|
file->refcount--;
|
||||||
eina_lock_release(&file->lock);
|
eina_lock_release(&file->lock);
|
||||||
if (file->refcount != 0) return ;
|
if (file->refcount != 0) return;
|
||||||
|
|
||||||
eina_lock_take(&_eina_file_lock_cache);
|
eina_lock_take(&_eina_file_lock_cache);
|
||||||
|
|
||||||
|
|
|
@ -379,7 +379,7 @@ eina_inarray_step_set(Eina_Inarray *array,
|
||||||
(int) sizeof (Eina_Inarray));
|
(int) sizeof (Eina_Inarray));
|
||||||
/* Force memory to zero to provide a small layer of security */
|
/* Force memory to zero to provide a small layer of security */
|
||||||
memset(array, 0, sizeof_eina_inarray);
|
memset(array, 0, sizeof_eina_inarray);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_eina_inarray_setup(array, member_size, step);
|
_eina_inarray_setup(array, member_size, step);
|
||||||
|
|
|
@ -140,7 +140,7 @@ eina_iterator_foreach(Eina_Iterator *iterator,
|
||||||
EINA_SAFETY_ON_NULL_RETURN(iterator->next);
|
EINA_SAFETY_ON_NULL_RETURN(iterator->next);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(cb);
|
EINA_SAFETY_ON_NULL_RETURN(cb);
|
||||||
|
|
||||||
if (!eina_iterator_lock(iterator)) return ;
|
if (!eina_iterator_lock(iterator)) return;
|
||||||
|
|
||||||
container = iterator->get_container(iterator);
|
container = iterator->get_container(iterator);
|
||||||
while (iterator->next(iterator, &data) == EINA_TRUE)
|
while (iterator->next(iterator, &data) == EINA_TRUE)
|
||||||
|
|
|
@ -2172,7 +2172,7 @@ eina_log_timing(int domain,
|
||||||
Eina_Log_Domain *d;
|
Eina_Log_Domain *d;
|
||||||
Eina_Log_Timing *t;
|
Eina_Log_Timing *t;
|
||||||
|
|
||||||
if (_disable_timing) return ;
|
if (_disable_timing) return;
|
||||||
|
|
||||||
d = _log_domains + domain;
|
d = _log_domains + domain;
|
||||||
t = _log_timing + domain;
|
t = _log_timing + domain;
|
||||||
|
@ -2187,11 +2187,11 @@ eina_log_timing(int domain,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!t->phase && state == EINA_LOG_STATE_STOP)
|
if (!t->phase && state == EINA_LOG_STATE_STOP)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
if (t->phase == EINA_LOG_STATE_INIT &&
|
if (t->phase == EINA_LOG_STATE_INIT &&
|
||||||
phase == EINA_LOG_STATE_SHUTDOWN)
|
phase == EINA_LOG_STATE_SHUTDOWN)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
if (state == EINA_LOG_STATE_START &&
|
if (state == EINA_LOG_STATE_START &&
|
||||||
t->phase &&
|
t->phase &&
|
||||||
|
|
|
@ -760,7 +760,7 @@ eina_object_del(Eina_Class *class,
|
||||||
{
|
{
|
||||||
Eina_Object_Item *item;
|
Eina_Object_Item *item;
|
||||||
|
|
||||||
if (!object) return ;
|
if (!object) return;
|
||||||
EINA_MAGIC_CHECK_CLASS(class);
|
EINA_MAGIC_CHECK_CLASS(class);
|
||||||
|
|
||||||
if (!eina_lock_take(&class->mutex))
|
if (!eina_lock_take(&class->mutex))
|
||||||
|
|
|
@ -372,7 +372,7 @@ _eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
|
||||||
|
|
||||||
/* list all the content that should be copied */
|
/* list all the content that should be copied */
|
||||||
if (!_eio_dir_recursiv_ls(thread, copy, copy->progress.source))
|
if (!_eio_dir_recursiv_ls(thread, copy, copy->progress.source))
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
/* init all structure needed to copy the file */
|
/* init all structure needed to copy the file */
|
||||||
if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, copy, &file_copy))
|
if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, copy, &file_copy))
|
||||||
|
@ -437,7 +437,7 @@ _eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
|
||||||
if (!ecore_thread_check(thread))
|
if (!ecore_thread_check(thread))
|
||||||
eio_progress_send(thread, ©->progress, count, count);
|
eio_progress_send(thread, ©->progress, count, count);
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -497,12 +497,12 @@ _eio_dir_move_heavy(void *data, Ecore_Thread *thread)
|
||||||
{
|
{
|
||||||
/* we are really lucky */
|
/* we are really lucky */
|
||||||
eio_progress_send(thread, &move->progress, 1, 1);
|
eio_progress_send(thread, &move->progress, 1, 1);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* list all the content that should be moved */
|
/* list all the content that should be moved */
|
||||||
if (!_eio_dir_recursiv_ls(thread, move, move->progress.source))
|
if (!_eio_dir_recursiv_ls(thread, move, move->progress.source))
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
/* init all structure needed to move the file */
|
/* init all structure needed to move the file */
|
||||||
if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, move, &file_move))
|
if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, move, &file_move))
|
||||||
|
@ -599,7 +599,7 @@ _eio_dir_rmrf_heavy(void *data, Ecore_Thread *thread)
|
||||||
|
|
||||||
/* list all the content that should be moved */
|
/* list all the content that should be moved */
|
||||||
if (!_eio_dir_recursiv_ls(thread, rmrf, rmrf->progress.source))
|
if (!_eio_dir_recursiv_ls(thread, rmrf, rmrf->progress.source))
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
/* init counter */
|
/* init counter */
|
||||||
step = 0;
|
step = 0;
|
||||||
|
|
|
@ -43,7 +43,7 @@ _eio_file_heavy(void *data, Ecore_Thread *thread)
|
||||||
if (!ls)
|
if (!ls)
|
||||||
{
|
{
|
||||||
eio_file_thread_error(&async->ls.common, thread);
|
eio_file_thread_error(&async->ls.common, thread);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
|
eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
|
||||||
|
@ -139,7 +139,7 @@ _eio_file_eina_ls_heavy(Ecore_Thread *thread, Eio_File_Direct_Ls *async, Eina_It
|
||||||
if (!ls)
|
if (!ls)
|
||||||
{
|
{
|
||||||
eio_file_thread_error(&async->ls.common, thread);
|
eio_file_thread_error(&async->ls.common, thread);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
|
eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
|
||||||
|
@ -388,7 +388,7 @@ _eio_file_move_error(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
if (move->copy)
|
if (move->copy)
|
||||||
{
|
{
|
||||||
eio_file_cancel(move->copy);
|
eio_file_cancel(move->copy);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (move->progress.common.error == EXDEV)
|
if (move->progress.common.error == EXDEV)
|
||||||
|
@ -406,7 +406,7 @@ _eio_file_move_error(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
move->copy = eio_cp;
|
move->copy = eio_cp;
|
||||||
|
|
||||||
move->progress.common.thread = ((Eio_File_Progress*)move->copy)->common.thread;
|
move->progress.common.thread = ((Eio_File_Progress*)move->copy)->common.thread;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -115,10 +115,10 @@ eio_progress_send(Ecore_Thread *thread, Eio_File_Progress *op, long long current
|
||||||
Eio_Progress *progress;
|
Eio_Progress *progress;
|
||||||
|
|
||||||
if (op->progress_cb == NULL)
|
if (op->progress_cb == NULL)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
progress = eio_progress_malloc();
|
progress = eio_progress_malloc();
|
||||||
if (!progress) return ;
|
if (!progress) return;
|
||||||
|
|
||||||
progress->op = op->op;
|
progress->op = op->op;
|
||||||
progress->current = current;
|
progress->current = current;
|
||||||
|
@ -173,7 +173,7 @@ eio_associate_free(void *data)
|
||||||
{
|
{
|
||||||
Eio_File_Associate *tmp;
|
Eio_File_Associate *tmp;
|
||||||
|
|
||||||
if (!data) return ;
|
if (!data) return;
|
||||||
|
|
||||||
tmp = data;
|
tmp = data;
|
||||||
if (tmp->free_cb)
|
if (tmp->free_cb)
|
||||||
|
|
|
@ -92,7 +92,7 @@ _eio_monitor_error(Eio_Monitor *monitor, int error)
|
||||||
Eio_Monitor_Error *ev;
|
Eio_Monitor_Error *ev;
|
||||||
|
|
||||||
ev = calloc(1, sizeof (Eio_Monitor_Error));
|
ev = calloc(1, sizeof (Eio_Monitor_Error));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
ev->monitor = monitor;
|
ev->monitor = monitor;
|
||||||
EINA_REFCOUNT_REF(ev->monitor);
|
EINA_REFCOUNT_REF(ev->monitor);
|
||||||
|
@ -115,7 +115,7 @@ _eio_monitor_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error)
|
||||||
EINA_REFCOUNT_UNREF(monitor)
|
EINA_REFCOUNT_UNREF(monitor)
|
||||||
_eio_monitor_free(monitor);
|
_eio_monitor_free(monitor);
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -186,7 +186,7 @@ _eio_monitor_send(Eio_Monitor *monitor, const char *filename, int event_code)
|
||||||
Eio_Monitor_Event *ev;
|
Eio_Monitor_Event *ev;
|
||||||
|
|
||||||
ev = calloc(1, sizeof (Eio_Monitor_Event));
|
ev = calloc(1, sizeof (Eio_Monitor_Event));
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
ev->monitor = monitor;
|
ev->monitor = monitor;
|
||||||
EINA_REFCOUNT_REF(ev->monitor);
|
EINA_REFCOUNT_REF(ev->monitor);
|
||||||
|
@ -221,7 +221,7 @@ _eio_monitor_rename(Eio_Monitor *monitor, const char *newpath)
|
||||||
if (tmp == monitor->path)
|
if (tmp == monitor->path)
|
||||||
{
|
{
|
||||||
_eio_monitor_error(monitor, -1);
|
_eio_monitor_error(monitor, -1);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EINA_REFCOUNT_REF(monitor); /* as we spawn a thread for this monitor, we need to refcount specifically for it */
|
EINA_REFCOUNT_REF(monitor); /* as we spawn a thread for this monitor, we need to refcount specifically for it */
|
||||||
|
|
|
@ -170,7 +170,7 @@ void eio_monitor_backend_init(void)
|
||||||
|
|
||||||
fd = inotify_init();
|
fd = inotify_init();
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
#ifdef HAVE_FCNTL
|
#ifdef HAVE_FCNTL
|
||||||
flags = fcntl(fd, F_GETFD);
|
flags = fcntl(fd, F_GETFD);
|
||||||
|
@ -182,7 +182,7 @@ void eio_monitor_backend_init(void)
|
||||||
if (!_inotify_fdh)
|
if (!_inotify_fdh)
|
||||||
{
|
{
|
||||||
close(fd);
|
close(fd);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_inotify_monitors = eina_hash_int32_new(_eio_inotify_del);
|
_inotify_monitors = eina_hash_int32_new(_eio_inotify_del);
|
||||||
|
@ -192,7 +192,7 @@ void eio_monitor_backend_shutdown(void)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
if (!_inotify_fdh) return ;
|
if (!_inotify_fdh) return;
|
||||||
|
|
||||||
eina_hash_free(_inotify_monitors);
|
eina_hash_free(_inotify_monitors);
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ void eio_monitor_backend_del(Eio_Monitor *monitor)
|
||||||
if (!_inotify_fdh)
|
if (!_inotify_fdh)
|
||||||
eio_monitor_fallback_del(monitor);
|
eio_monitor_fallback_del(monitor);
|
||||||
|
|
||||||
if (!monitor->backend) return ;
|
if (!monitor->backend) return;
|
||||||
|
|
||||||
eina_hash_del(_inotify_monitors, &monitor->backend->hwnd, monitor->backend);
|
eina_hash_del(_inotify_monitors, &monitor->backend->hwnd, monitor->backend);
|
||||||
monitor->backend = NULL;
|
monitor->backend = NULL;
|
||||||
|
|
|
@ -72,7 +72,7 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
|
||||||
est = alloca(sizeof (Eina_Stat));
|
est = alloca(sizeof (Eina_Stat));
|
||||||
|
|
||||||
if (!backend->parent)
|
if (!backend->parent)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
if (_eio_stat(backend->parent->path, &st))
|
if (_eio_stat(backend->parent->path, &st))
|
||||||
{
|
{
|
||||||
|
@ -83,7 +83,7 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
|
||||||
ecore_thread_main_loop_end();
|
ecore_thread_main_loop_end();
|
||||||
backend->destroyed = EINA_TRUE;
|
backend->destroyed = EINA_TRUE;
|
||||||
}
|
}
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
backend->destroyed = EINA_FALSE;
|
backend->destroyed = EINA_FALSE;
|
||||||
|
@ -229,7 +229,7 @@ _eio_monitor_fallback_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
if (backend->delete_me)
|
if (backend->delete_me)
|
||||||
{
|
{
|
||||||
free(backend);
|
free(backend);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
backend->timer = ecore_timer_add(60.0, _eio_monitor_fallback_timer_cb, backend);
|
backend->timer = ecore_timer_add(60.0, _eio_monitor_fallback_timer_cb, backend);
|
||||||
}
|
}
|
||||||
|
@ -308,7 +308,7 @@ eio_monitor_fallback_add(Eio_Monitor *monitor)
|
||||||
monitor->backend = NULL;
|
monitor->backend = NULL;
|
||||||
|
|
||||||
backend = calloc(1, sizeof (Eio_Monitor_Backend));
|
backend = calloc(1, sizeof (Eio_Monitor_Backend));
|
||||||
if (!backend) return ;
|
if (!backend) return;
|
||||||
|
|
||||||
backend->children = eina_hash_string_superfast_new(free);
|
backend->children = eina_hash_string_superfast_new(free);
|
||||||
backend->parent = monitor;
|
backend->parent = monitor;
|
||||||
|
@ -327,7 +327,7 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
|
||||||
backend = monitor->backend;
|
backend = monitor->backend;
|
||||||
monitor->backend = NULL;
|
monitor->backend = NULL;
|
||||||
|
|
||||||
if (!backend) return ;
|
if (!backend) return;
|
||||||
|
|
||||||
backend->parent = NULL;
|
backend->parent = NULL;
|
||||||
if (backend->timer) ecore_timer_del(backend->timer);
|
if (backend->timer) ecore_timer_del(backend->timer);
|
||||||
|
@ -338,7 +338,7 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
|
||||||
{
|
{
|
||||||
backend->delete_me = EINA_TRUE;
|
backend->delete_me = EINA_TRUE;
|
||||||
ecore_thread_cancel(backend->work);
|
ecore_thread_cancel(backend->work);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
eina_hash_free(backend->children);
|
eina_hash_free(backend->children);
|
||||||
free(backend);
|
free(backend);
|
||||||
|
|
|
@ -404,7 +404,7 @@ void eio_monitor_backend_del(Eio_Monitor *monitor)
|
||||||
if (!_eio_monitor_win32_native)
|
if (!_eio_monitor_win32_native)
|
||||||
{
|
{
|
||||||
eio_monitor_fallback_del(monitor);
|
eio_monitor_fallback_del(monitor);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_eio_monitor_win32_watcher_free(monitor->backend->watcher_parent);
|
_eio_monitor_win32_watcher_free(monitor->backend->watcher_parent);
|
||||||
|
|
|
@ -256,11 +256,11 @@ _eio_file_chown(void *data, Ecore_Thread *thread)
|
||||||
if (chown(own->path, owner, group) != 0)
|
if (chown(own->path, owner, group) != 0)
|
||||||
eio_file_thread_error(&own->common, thread);
|
eio_file_thread_error(&own->common, thread);
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
ecore_thread_cancel(thread);
|
ecore_thread_cancel(thread);
|
||||||
return ;
|
return;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ _eio_ls_xattr_heavy(void *data, Ecore_Thread *thread)
|
||||||
const char *tmp;
|
const char *tmp;
|
||||||
|
|
||||||
it = eina_xattr_ls(async->ls.directory);
|
it = eina_xattr_ls(async->ls.directory);
|
||||||
if (!it) return ;
|
if (!it) return;
|
||||||
|
|
||||||
EINA_ITERATOR_FOREACH(it, tmp)
|
EINA_ITERATOR_FOREACH(it, tmp)
|
||||||
{
|
{
|
||||||
|
|
|
@ -697,7 +697,7 @@ emotion_object_position_set(Evas_Object *obj, double sec)
|
||||||
if (!sd->open)
|
if (!sd->open)
|
||||||
{
|
{
|
||||||
sd->remember_jump = sec;
|
sd->remember_jump = sec;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
sd->remember_jump = 0;
|
sd->remember_jump = 0;
|
||||||
sd->seek_pos = sec;
|
sd->seek_pos = sec;
|
||||||
|
@ -1276,17 +1276,17 @@ emotion_object_last_position_load(Evas_Object *obj)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
||||||
if (!sd->file) return ;
|
if (!sd->file) return;
|
||||||
|
|
||||||
if (!strncmp(sd->file, "file://", 7))
|
if (!strncmp(sd->file, "file://", 7))
|
||||||
tmp = sd->file + 7;
|
tmp = sd->file + 7;
|
||||||
else if (!strstr(sd->file, "://"))
|
else if (!strstr(sd->file, "://"))
|
||||||
tmp = sd->file;
|
tmp = sd->file;
|
||||||
else
|
else
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
#ifdef HAVE_EIO
|
#ifdef HAVE_EIO
|
||||||
if (sd->load_xattr) return ;
|
if (sd->load_xattr) return;
|
||||||
|
|
||||||
EINA_REFCOUNT_REF(sd);
|
EINA_REFCOUNT_REF(sd);
|
||||||
|
|
||||||
|
@ -1348,17 +1348,17 @@ emotion_object_last_position_save(Evas_Object *obj)
|
||||||
const char *tmp;
|
const char *tmp;
|
||||||
|
|
||||||
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
||||||
if (!sd->file) return ;
|
if (!sd->file) return;
|
||||||
|
|
||||||
if (!strncmp(sd->file, "file://", 7))
|
if (!strncmp(sd->file, "file://", 7))
|
||||||
tmp = sd->file + 7;
|
tmp = sd->file + 7;
|
||||||
else if (!strstr(sd->file, "://"))
|
else if (!strstr(sd->file, "://"))
|
||||||
tmp = sd->file;
|
tmp = sd->file;
|
||||||
else
|
else
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
#ifdef HAVE_EIO
|
#ifdef HAVE_EIO
|
||||||
if (sd->save_xattr) return ;
|
if (sd->save_xattr) return;
|
||||||
|
|
||||||
EINA_REFCOUNT_REF(sd);
|
EINA_REFCOUNT_REF(sd);
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ _emotion_check_device(Emotion_Webcam *ew)
|
||||||
int fd;
|
int fd;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!ew) return ;
|
if (!ew) return;
|
||||||
#ifdef HAVE_V4L2
|
#ifdef HAVE_V4L2
|
||||||
if (!ew->device) goto on_error;
|
if (!ew->device) goto on_error;
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@ _emotion_check_device(Emotion_Webcam *ew)
|
||||||
|
|
||||||
EINA_REFCOUNT_INIT(ew);
|
EINA_REFCOUNT_INIT(ew);
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1171,7 +1171,7 @@ ethumb_thumb_hash_copy(Ethumb *dst, const Ethumb *src)
|
||||||
EINA_SAFETY_ON_NULL_RETURN(dst);
|
EINA_SAFETY_ON_NULL_RETURN(dst);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(src);
|
EINA_SAFETY_ON_NULL_RETURN(src);
|
||||||
|
|
||||||
if (src == dst) return ;
|
if (src == dst) return;
|
||||||
|
|
||||||
eina_stringshare_del(dst->src_hash);
|
eina_stringshare_del(dst->src_hash);
|
||||||
dst->src_hash = eina_stringshare_ref(src->src_hash);
|
dst->src_hash = eina_stringshare_ref(src->src_hash);
|
||||||
|
|
|
@ -388,7 +388,7 @@ evas_cache_engine_image_drop(Engine_Image_Entry *eim)
|
||||||
if (eim->flags.dirty)
|
if (eim->flags.dirty)
|
||||||
{
|
{
|
||||||
_evas_cache_engine_image_dealloc(cache, eim);
|
_evas_cache_engine_image_dealloc(cache, eim);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eim->references == 0)
|
if (eim->references == 0)
|
||||||
|
@ -396,7 +396,7 @@ evas_cache_engine_image_drop(Engine_Image_Entry *eim)
|
||||||
_evas_cache_engine_image_remove_activ(cache, eim);
|
_evas_cache_engine_image_remove_activ(cache, eim);
|
||||||
_evas_cache_engine_image_make_inactive(cache, eim, eim->cache_key);
|
_evas_cache_engine_image_make_inactive(cache, eim, eim->cache_key);
|
||||||
evas_cache_engine_image_flush(cache);
|
evas_cache_engine_image_flush(cache);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -307,7 +307,7 @@ _canvas_output_method_set(Eo *eo_e, void *_pd, va_list *list)
|
||||||
if (e->output.render_method != RENDER_METHOD_INVALID) return;
|
if (e->output.render_method != RENDER_METHOD_INVALID) return;
|
||||||
/* Request the right engine. */
|
/* Request the right engine. */
|
||||||
em = evas_module_engine_get(render_method);
|
em = evas_module_engine_get(render_method);
|
||||||
if (!em) return ;
|
if (!em) return;
|
||||||
if (em->id_engine != render_method) return;
|
if (em->id_engine != render_method) return;
|
||||||
if (!evas_module_load(em)) return;
|
if (!evas_module_load(em)) return;
|
||||||
|
|
||||||
|
|
|
@ -1240,7 +1240,7 @@ evas_object_map_update(Evas_Object *eo_obj,
|
||||||
obj->changed_map = EINA_TRUE;
|
obj->changed_map = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!obj->changed_map) return ;
|
if (!obj->changed_map) return;
|
||||||
|
|
||||||
if (obj->map->cur.map && obj->map->spans && obj->map->cur.map->count != obj->map->spans->count)
|
if (obj->map->cur.map && obj->map->spans && obj->map->cur.map->count != obj->map->spans->count)
|
||||||
{
|
{
|
||||||
|
@ -1264,7 +1264,7 @@ evas_object_map_update(Evas_Object *eo_obj,
|
||||||
EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write);
|
EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!obj->map->spans) return ;
|
if (!obj->map->spans) return;
|
||||||
|
|
||||||
EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write)
|
EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write)
|
||||||
{
|
{
|
||||||
|
|
|
@ -309,7 +309,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED)
|
||||||
evas_object_inject(eo_obj, obj, eo_e);
|
evas_object_inject(eo_obj, obj, eo_e);
|
||||||
|
|
||||||
if (!_init_cow(eo_obj))
|
if (!_init_cow(eo_obj))
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
o->load_opts = eina_cow_alloc(evas_object_image_load_opts_cow);
|
o->load_opts = eina_cow_alloc(evas_object_image_load_opts_cow);
|
||||||
o->pixels = eina_cow_alloc(evas_object_image_pixels_cow);
|
o->pixels = eina_cow_alloc(evas_object_image_pixels_cow);
|
||||||
|
@ -1670,7 +1670,7 @@ EAPI void
|
||||||
evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel)
|
evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel)
|
||||||
{
|
{
|
||||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||||
return ;
|
return;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
if (cancel)
|
if (cancel)
|
||||||
eo_do(eo_obj, evas_obj_image_preload_cancel());
|
eo_do(eo_obj, evas_obj_image_preload_cancel());
|
||||||
|
@ -2489,7 +2489,7 @@ _image_load_orientation_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||||
Eina_Bool enable = va_arg(*list, int);
|
Eina_Bool enable = va_arg(*list, int);
|
||||||
Evas_Object_Image *o = _pd;
|
Evas_Object_Image *o = _pd;
|
||||||
|
|
||||||
if (o->load_opts->orientation == !!enable) return ;
|
if (o->load_opts->orientation == !!enable) return;
|
||||||
|
|
||||||
EINA_COW_LOAD_OPTS_WRITE_BEGIN(o, low)
|
EINA_COW_LOAD_OPTS_WRITE_BEGIN(o, low)
|
||||||
low->orientation = !!enable;
|
low->orientation = !!enable;
|
||||||
|
@ -2585,14 +2585,14 @@ _image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||||
|
|
||||||
if (surf)
|
if (surf)
|
||||||
{
|
{
|
||||||
if (surf->version != EVAS_VIDEO_SURFACE_VERSION) return ;
|
if (surf->version != EVAS_VIDEO_SURFACE_VERSION) return;
|
||||||
|
|
||||||
if (!surf->update_pixels ||
|
if (!surf->update_pixels ||
|
||||||
!surf->move ||
|
!surf->move ||
|
||||||
!surf->resize ||
|
!surf->resize ||
|
||||||
!surf->hide ||
|
!surf->hide ||
|
||||||
!surf->show)
|
!surf->show)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
o->created = EINA_TRUE;
|
o->created = EINA_TRUE;
|
||||||
o->video_surface = EINA_TRUE;
|
o->video_surface = EINA_TRUE;
|
||||||
|
@ -2612,7 +2612,7 @@ _image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||||
!o->pixels->video.hide &&
|
!o->pixels->video.hide &&
|
||||||
!o->pixels->video.show &&
|
!o->pixels->video.show &&
|
||||||
!o->pixels->video.data)
|
!o->pixels->video.data)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
o->video_surface = EINA_FALSE;
|
o->video_surface = EINA_FALSE;
|
||||||
EINA_COW_PIXEL_WRITE_BEGIN(o, pixi_write)
|
EINA_COW_PIXEL_WRITE_BEGIN(o, pixi_write)
|
||||||
|
@ -3607,7 +3607,7 @@ _evas_object_image_free(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Evas_Object_Image *o;
|
Evas_Object_Image *o;
|
||||||
|
|
||||||
if (!eo_isa(obj, MY_CLASS)) return ;
|
if (!eo_isa(obj, MY_CLASS)) return;
|
||||||
|
|
||||||
o = eo_data_scope_get(obj, MY_CLASS);
|
o = eo_data_scope_get(obj, MY_CLASS);
|
||||||
|
|
||||||
|
|
|
@ -1169,9 +1169,9 @@ evas_object_update_bounding_box(Evas_Object *eo_obj, Evas_Object_Protected_Data
|
||||||
Evas_Coord px, py, pw, ph;
|
Evas_Coord px, py, pw, ph;
|
||||||
Eina_Bool noclip;
|
Eina_Bool noclip;
|
||||||
|
|
||||||
if (!obj->smart.parent) return ;
|
if (!obj->smart.parent) return;
|
||||||
|
|
||||||
if (obj->child_has_map) return ; /* Disable bounding box computation for this object and its parent */
|
if (obj->child_has_map) return; /* Disable bounding box computation for this object and its parent */
|
||||||
/* We could also remove object that are not visible from the bounding box, use the clipping information
|
/* We could also remove object that are not visible from the bounding box, use the clipping information
|
||||||
to reduce the bounding of the object they are clipping, but for the moment this will do it's jobs */
|
to reduce the bounding of the object they are clipping, but for the moment this will do it's jobs */
|
||||||
noclip = !(obj->clip.clipees || obj->is_static_clip);
|
noclip = !(obj->clip.clipees || obj->is_static_clip);
|
||||||
|
@ -1426,7 +1426,7 @@ evas_object_smart_need_bounding_box_update(Evas_Object *eo_obj)
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
|
||||||
Evas_Object_Smart *o = eo_data_scope_get(eo_obj, MY_CLASS);
|
Evas_Object_Smart *o = eo_data_scope_get(eo_obj, MY_CLASS);
|
||||||
|
|
||||||
if (o->update_boundingbox_needed) return ;
|
if (o->update_boundingbox_needed) return;
|
||||||
o->update_boundingbox_needed = EINA_TRUE;
|
o->update_boundingbox_needed = EINA_TRUE;
|
||||||
|
|
||||||
if (obj->smart.parent) evas_object_smart_need_bounding_box_update(obj->smart.parent);
|
if (obj->smart.parent) evas_object_smart_need_bounding_box_update(obj->smart.parent);
|
||||||
|
@ -1449,7 +1449,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
|
||||||
|
|
||||||
os = eo_data_scope_get(eo_obj, MY_CLASS);
|
os = eo_data_scope_get(eo_obj, MY_CLASS);
|
||||||
|
|
||||||
if (!os->update_boundingbox_needed) return ;
|
if (!os->update_boundingbox_needed) return;
|
||||||
os->update_boundingbox_needed = EINA_FALSE;
|
os->update_boundingbox_needed = EINA_FALSE;
|
||||||
|
|
||||||
minx = obj->layer->evas->output.w;
|
minx = obj->layer->evas->output.w;
|
||||||
|
|
|
@ -692,7 +692,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
|
||||||
obj->cur->scale == obj->prev->scale &&
|
obj->cur->scale == obj->prev->scale &&
|
||||||
o->last_computed.w == obj->cur->geometry.w &&
|
o->last_computed.w == obj->cur->geometry.w &&
|
||||||
o->last_computed.h == obj->cur->geometry.h)
|
o->last_computed.h == obj->cur->geometry.h)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
evas_object_content_change(eo_obj, obj);
|
evas_object_content_change(eo_obj, obj);
|
||||||
|
|
||||||
|
@ -921,7 +921,7 @@ _text_ellipsis_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||||
Evas_Object_Text *o = _pd;
|
Evas_Object_Text *o = _pd;
|
||||||
double ellipsis = va_arg(*list, double);
|
double ellipsis = va_arg(*list, double);
|
||||||
|
|
||||||
if (o->cur.ellipsis == ellipsis) return ;
|
if (o->cur.ellipsis == ellipsis) return;
|
||||||
|
|
||||||
o->cur.ellipsis = ellipsis;
|
o->cur.ellipsis = ellipsis;
|
||||||
o->changed = 1;
|
o->changed = 1;
|
||||||
|
|
|
@ -694,7 +694,7 @@ evas_object_textgrid_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
|
||||||
if (!fad)
|
if (!fad)
|
||||||
{
|
{
|
||||||
ERR("Failed to allocate Evas_Font_Array_Data.");
|
ERR("Failed to allocate Evas_Font_Array_Data.");
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (xx = 0; xx < row->texts_num; xx++)
|
for (xx = 0; xx < row->texts_num; xx++)
|
||||||
|
@ -1407,7 +1407,7 @@ _palette_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||||
color->r == r &&
|
color->r == r &&
|
||||||
color->g == g &&
|
color->g == g &&
|
||||||
color->b == b)
|
color->b == b)
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -751,7 +751,7 @@ clean_stuff:
|
||||||
OBJS_ARRAY_CLEAN(&e->restack_objects);
|
OBJS_ARRAY_CLEAN(&e->restack_objects);
|
||||||
OBJS_ARRAY_CLEAN(&e->delete_objects);
|
OBJS_ARRAY_CLEAN(&e->delete_objects);
|
||||||
e->invalidate = EINA_TRUE;
|
e->invalidate = EINA_TRUE;
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ evas_common_draw_context_cutouts_new(void)
|
||||||
EAPI void
|
EAPI void
|
||||||
evas_common_draw_context_cutouts_free(Cutout_Rects* rects)
|
evas_common_draw_context_cutouts_free(Cutout_Rects* rects)
|
||||||
{
|
{
|
||||||
if (!rects) return ;
|
if (!rects) return;
|
||||||
rects->active = 0;
|
rects->active = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -445,7 +445,7 @@ evas_common_font_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip,
|
||||||
dc->clip.x, dc->clip.y,
|
dc->clip.x, dc->clip.y,
|
||||||
dc->clip.w, dc->clip.h,
|
dc->clip.w, dc->clip.h,
|
||||||
im_w, im_h);
|
im_w, im_h);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < reuse->active; ++i)
|
for (i = 0; i < reuse->active; ++i)
|
||||||
|
|
|
@ -921,7 +921,7 @@ evas_common_font_flush_last(void)
|
||||||
{
|
{
|
||||||
RGBA_Font_Int *fi = NULL;
|
RGBA_Font_Int *fi = NULL;
|
||||||
|
|
||||||
if (!fonts_lru) return ;
|
if (!fonts_lru) return;
|
||||||
fi = eina_list_data_get(fonts_lru);
|
fi = eina_list_data_get(fonts_lru);
|
||||||
fonts_lru = eina_list_remove_list(fonts_lru, fonts_lru);
|
fonts_lru = eina_list_remove_list(fonts_lru, fonts_lru);
|
||||||
eina_hash_del(fonts, fi, fi);
|
eina_hash_del(fonts, fi, fi);
|
||||||
|
|
|
@ -908,8 +908,8 @@ evas_common_image_premul(Image_Entry *ie)
|
||||||
{
|
{
|
||||||
DATA32 nas = 0;
|
DATA32 nas = 0;
|
||||||
|
|
||||||
if (!ie) return ;
|
if (!ie) return;
|
||||||
if (!evas_cache_image_pixels(ie)) return ;
|
if (!evas_cache_image_pixels(ie)) return;
|
||||||
if (!ie->flags.alpha) return;
|
if (!ie->flags.alpha) return;
|
||||||
|
|
||||||
nas = evas_common_convert_argb_premul(evas_cache_image_pixels(ie), ie->w * ie->h);
|
nas = evas_common_convert_argb_premul(evas_cache_image_pixels(ie), ie->w * ie->h);
|
||||||
|
@ -924,7 +924,7 @@ evas_common_image_set_alpha_sparse(Image_Entry *ie)
|
||||||
DATA32 nas = 0;
|
DATA32 nas = 0;
|
||||||
|
|
||||||
if (!ie) return;
|
if (!ie) return;
|
||||||
if (!evas_cache_image_pixels(ie)) return ;
|
if (!evas_cache_image_pixels(ie)) return;
|
||||||
if (!ie->flags.alpha) return;
|
if (!ie->flags.alpha) return;
|
||||||
|
|
||||||
s = evas_cache_image_pixels(ie);
|
s = evas_cache_image_pixels(ie);
|
||||||
|
|
|
@ -450,7 +450,7 @@ _rgba_map_cutout_resize(RGBA_Map *m, int count)
|
||||||
|
|
||||||
if (old && old->count == count)
|
if (old && old->count == count)
|
||||||
{
|
{
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
size = sizeof (RGBA_Map_Cutout) + sizeof (RGBA_Map_Spans) * (count - 1);
|
size = sizeof (RGBA_Map_Cutout) + sizeof (RGBA_Map_Spans) * (count - 1);
|
||||||
|
@ -471,11 +471,11 @@ _rgba_map_cutout_resize(RGBA_Map *m, int count)
|
||||||
memset(r, 0, size);
|
memset(r, 0, size);
|
||||||
m->engine_data = r;
|
m->engine_data = r;
|
||||||
r->count = count;
|
r->count = count;
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
empty:
|
empty:
|
||||||
evas_common_map_rgba_clean(m);
|
evas_common_map_rgba_clean(m);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -772,7 +772,7 @@ EAPI void
|
||||||
evas_common_pipe_image_load(RGBA_Image *im)
|
evas_common_pipe_image_load(RGBA_Image *im)
|
||||||
{
|
{
|
||||||
if (im->flags & RGBA_IMAGE_TODO_LOAD)
|
if (im->flags & RGBA_IMAGE_TODO_LOAD)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888
|
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888
|
||||||
&& !evas_cache_image_is_loaded(&(im->cache_entry)))
|
&& !evas_cache_image_is_loaded(&(im->cache_entry)))
|
||||||
|
@ -781,7 +781,7 @@ evas_common_pipe_image_load(RGBA_Image *im)
|
||||||
if (!((!im->cs.data) || ((!im->cs.dirty) && (!(im->flags & RGBA_IMAGE_IS_DIRTY)))))
|
if (!((!im->cs.data) || ((!im->cs.dirty) && (!(im->flags & RGBA_IMAGE_IS_DIRTY)))))
|
||||||
goto add_task;
|
goto add_task;
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
add_task:
|
add_task:
|
||||||
LKL(im_task_mutex);
|
LKL(im_task_mutex);
|
||||||
|
@ -796,10 +796,10 @@ evas_common_pipe_text_prepare(Evas_Text_Props *text_props)
|
||||||
RGBA_Font_Int *fi;
|
RGBA_Font_Int *fi;
|
||||||
|
|
||||||
fi = text_props->font_instance;
|
fi = text_props->font_instance;
|
||||||
if (!fi) return ;
|
if (!fi) return;
|
||||||
|
|
||||||
if (!text_props->changed && text_props->generation == fi->generation && text_props->glyphs)
|
if (!text_props->changed && text_props->generation == fi->generation && text_props->glyphs)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
LKL(fi->ft_mutex);
|
LKL(fi->ft_mutex);
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@ evas_common_rectangle_draw_do(const Cutout_Rects *reuse,
|
||||||
clip->x, clip->y,
|
clip->x, clip->y,
|
||||||
clip->w, clip->h);
|
clip->w, clip->h);
|
||||||
rectangle_draw_internal(dst, dc, x, y, w, h);
|
rectangle_draw_internal(dst, dc, x, y, w, h);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < reuse->active; ++i)
|
for (i = 0; i < reuse->active; ++i)
|
||||||
|
|
|
@ -469,7 +469,7 @@ evas_module_unload(Evas_Module *em)
|
||||||
if (!em->loaded)
|
if (!em->loaded)
|
||||||
return;
|
return;
|
||||||
if (!em->definition)
|
if (!em->definition)
|
||||||
return ;
|
return;
|
||||||
|
|
||||||
// for now lets not unload modules - they may still be in use.
|
// for now lets not unload modules - they may still be in use.
|
||||||
// em->definition->func.close(em);
|
// em->definition->func.close(em);
|
||||||
|
|
|
@ -293,7 +293,7 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
|
||||||
| SDL_DOUBLEBUF);
|
| SDL_DOUBLEBUF);
|
||||||
if (!einfo->info.switch_data)
|
if (!einfo->info.switch_data)
|
||||||
{
|
{
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_SetAlpha(einfo->info.switch_data, SDL_SRCALPHA, 0);
|
SDL_SetAlpha(einfo->info.switch_data, SDL_SRCALPHA, 0);
|
||||||
|
@ -308,7 +308,7 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
|
||||||
einfo->info.func.switch_buffer = _ecore_evas_sdl_switch_buffer;
|
einfo->info.func.switch_buffer = _ecore_evas_sdl_switch_buffer;
|
||||||
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *) einfo))
|
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *) einfo))
|
||||||
{
|
{
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -587,7 +587,7 @@ _ecore_evas_x_render_updates(void *data, Evas *e EINA_UNUSED, void *event_info)
|
||||||
Evas_Event_Render_Post *ev = event_info;
|
Evas_Event_Render_Post *ev = event_info;
|
||||||
Ecore_Evas *ee = data;
|
Ecore_Evas *ee = data;
|
||||||
|
|
||||||
if (!ev) return ;
|
if (!ev) return;
|
||||||
|
|
||||||
EDBG("ee=%p finished asynchronous render.", ee);
|
EDBG("ee=%p finished asynchronous render.", ee);
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ _player_send_cmd(Emotion_Generic_Video *ev, int cmd)
|
||||||
if (!ev->fd_write)
|
if (!ev->fd_write)
|
||||||
{
|
{
|
||||||
ERR("you should wait for emotion to be ready to take action.");
|
ERR("you should wait for emotion to be ready to take action.");
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
ecore_pipe_write(ev->fd_write, &cmd, sizeof(cmd));
|
ecore_pipe_write(ev->fd_write, &cmd, sizeof(cmd));
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ _player_send_int(Emotion_Generic_Video *ev, int number)
|
||||||
if (!ev->fd_write)
|
if (!ev->fd_write)
|
||||||
{
|
{
|
||||||
ERR("you should wait for emotion to be ready to take action.");
|
ERR("you should wait for emotion to be ready to take action.");
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
ecore_pipe_write(ev->fd_write, &number, sizeof(number));
|
ecore_pipe_write(ev->fd_write, &number, sizeof(number));
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ _player_send_float(Emotion_Generic_Video *ev, float number)
|
||||||
if (!ev->fd_write)
|
if (!ev->fd_write)
|
||||||
{
|
{
|
||||||
ERR("you should wait for emotion to be ready to take action.");
|
ERR("you should wait for emotion to be ready to take action.");
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
ecore_pipe_write(ev->fd_write, &number, sizeof(number));
|
ecore_pipe_write(ev->fd_write, &number, sizeof(number));
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ fakeeos_bin_handle_message(GstBin * bin, GstMessage * message)
|
||||||
switch (GST_MESSAGE_TYPE(message)) {
|
switch (GST_MESSAGE_TYPE(message)) {
|
||||||
case GST_MESSAGE_EOS:
|
case GST_MESSAGE_EOS:
|
||||||
/* what to do here ? just returning at the moment */
|
/* what to do here ? just returning at the moment */
|
||||||
return ;
|
return;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -308,7 +308,7 @@ em_play(void *video,
|
||||||
Emotion_Gstreamer_Video *ev;
|
Emotion_Gstreamer_Video *ev;
|
||||||
|
|
||||||
ev = (Emotion_Gstreamer_Video *)video;
|
ev = (Emotion_Gstreamer_Video *)video;
|
||||||
if (!ev->pipeline) return ;
|
if (!ev->pipeline) return;
|
||||||
|
|
||||||
if (ev->pipeline_parsed)
|
if (ev->pipeline_parsed)
|
||||||
gst_element_set_state(ev->pipeline, GST_STATE_PLAYING);
|
gst_element_set_state(ev->pipeline, GST_STATE_PLAYING);
|
||||||
|
@ -323,7 +323,7 @@ em_stop(void *video)
|
||||||
|
|
||||||
ev = (Emotion_Gstreamer_Video *)video;
|
ev = (Emotion_Gstreamer_Video *)video;
|
||||||
|
|
||||||
if (!ev->pipeline) return ;
|
if (!ev->pipeline) return;
|
||||||
|
|
||||||
if (ev->pipeline_parsed)
|
if (ev->pipeline_parsed)
|
||||||
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
||||||
|
@ -349,7 +349,7 @@ em_size_get(void *video,
|
||||||
if (width) *width = vstream->width;
|
if (width) *width = vstream->width;
|
||||||
if (height) *height = vstream->height;
|
if (height) *height = vstream->height;
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
|
@ -365,7 +365,7 @@ em_pos_set(void *video,
|
||||||
|
|
||||||
ev = (Emotion_Gstreamer_Video *)video;
|
ev = (Emotion_Gstreamer_Video *)video;
|
||||||
|
|
||||||
if (!ev->pipeline) return ;
|
if (!ev->pipeline) return;
|
||||||
|
|
||||||
if (ev->play)
|
if (ev->play)
|
||||||
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
||||||
|
@ -675,7 +675,7 @@ em_video_data_size_get(void *video, int *w, int *h)
|
||||||
*w = vstream->width;
|
*w = vstream->width;
|
||||||
*h = vstream->height;
|
*h = vstream->height;
|
||||||
|
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
|
@ -858,7 +858,7 @@ em_audio_channel_mute_set(void *video,
|
||||||
|
|
||||||
ev = (Emotion_Gstreamer_Video *)video;
|
ev = (Emotion_Gstreamer_Video *)video;
|
||||||
|
|
||||||
if (!ev->pipeline) return ;
|
if (!ev->pipeline) return;
|
||||||
|
|
||||||
ev->audio_mute = mute;
|
ev->audio_mute = mute;
|
||||||
|
|
||||||
|
@ -883,7 +883,7 @@ em_audio_channel_volume_set(void *video,
|
||||||
|
|
||||||
ev = (Emotion_Gstreamer_Video *)video;
|
ev = (Emotion_Gstreamer_Video *)video;
|
||||||
|
|
||||||
if (!ev->pipeline) return ;
|
if (!ev->pipeline) return;
|
||||||
|
|
||||||
if (vol < 0.0)
|
if (vol < 0.0)
|
||||||
vol = 0.0;
|
vol = 0.0;
|
||||||
|
@ -1024,7 +1024,7 @@ em_priority_set(void *video, Eina_Bool pri)
|
||||||
Emotion_Gstreamer_Video *ev;
|
Emotion_Gstreamer_Video *ev;
|
||||||
|
|
||||||
ev = video;
|
ev = video;
|
||||||
if (priority_overide > 3) return ; /* If we failed to much to create that pipeline, let's don't wast our time anymore */
|
if (priority_overide > 3) return; /* If we failed to much to create that pipeline, let's don't wast our time anymore */
|
||||||
|
|
||||||
if (ev->priority != pri && ev->pipeline)
|
if (ev->priority != pri && ev->pipeline)
|
||||||
{
|
{
|
||||||
|
|
|
@ -456,7 +456,7 @@ _update_emotion_fps(Emotion_Gstreamer_Video *ev)
|
||||||
{
|
{
|
||||||
double tim;
|
double tim;
|
||||||
|
|
||||||
if (!debug_fps) return ;
|
if (!debug_fps) return;
|
||||||
|
|
||||||
tim = ecore_time_get();
|
tim = ecore_time_get();
|
||||||
ev->frames++;
|
ev->frames++;
|
||||||
|
@ -829,7 +829,7 @@ _emotion_gstreamer_pause(void *data, Ecore_Thread *thread)
|
||||||
Emotion_Gstreamer_Video *ev = data;
|
Emotion_Gstreamer_Video *ev = data;
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
if (ecore_thread_check(thread) || !ev->pipeline) return ;
|
if (ecore_thread_check(thread) || !ev->pipeline) return;
|
||||||
|
|
||||||
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
gst_element_set_state(ev->pipeline, GST_STATE_PAUSED);
|
||||||
res = gst_element_get_state(ev->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
|
res = gst_element_get_state(ev->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
|
||||||
|
@ -965,7 +965,7 @@ _video_update_pixels(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_
|
||||||
Emotion_Gstreamer_Buffer *send;
|
Emotion_Gstreamer_Buffer *send;
|
||||||
EvasVideoSinkPrivate *priv = NULL;
|
EvasVideoSinkPrivate *priv = NULL;
|
||||||
|
|
||||||
if (!ev->send) return ;
|
if (!ev->send) return;
|
||||||
|
|
||||||
send = ev->send;
|
send = ev->send;
|
||||||
priv = send->sink;
|
priv = send->sink;
|
||||||
|
|
|
@ -1527,7 +1527,7 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
|
||||||
}
|
}
|
||||||
|
|
||||||
secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC);
|
secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -532,7 +532,7 @@ _draw_rectangle_thread_cmd(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y,
|
||||||
if ((w <= 0) || (h <= 0)) return;
|
if ((w <= 0) || (h <= 0)) return;
|
||||||
|
|
||||||
cr = eina_mempool_malloc(_mp_command_rect, sizeof (Evas_Thread_Command_Rect));
|
cr = eina_mempool_malloc(_mp_command_rect, sizeof (Evas_Thread_Command_Rect));
|
||||||
if (!cr) return ;
|
if (!cr) return;
|
||||||
|
|
||||||
cr->surface = dst;
|
cr->surface = dst;
|
||||||
cr->color = dc->col.col;
|
cr->color = dc->col.col;
|
||||||
|
@ -609,7 +609,7 @@ _line_draw_thread_cmd(RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, in
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
|
|
||||||
cl = eina_mempool_malloc(_mp_command_line, sizeof (Evas_Thread_Command_Line));
|
cl = eina_mempool_malloc(_mp_command_line, sizeof (Evas_Thread_Command_Line));
|
||||||
if (!cl) return ;
|
if (!cl) return;
|
||||||
|
|
||||||
cl->surface = dst;
|
cl->surface = dst;
|
||||||
|
|
||||||
|
@ -782,7 +782,7 @@ _polygon_draw_thread_cmd(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
|
||||||
}
|
}
|
||||||
|
|
||||||
cp = eina_mempool_malloc(_mp_command_polygon, sizeof (Evas_Thread_Command_Polygon));
|
cp = eina_mempool_malloc(_mp_command_polygon, sizeof (Evas_Thread_Command_Polygon));
|
||||||
if (!cp) return ;
|
if (!cp) return;
|
||||||
|
|
||||||
EINA_RECTANGLE_SET(&cp->ext, ext_x, ext_y, ext_w, ext_h);
|
EINA_RECTANGLE_SET(&cp->ext, ext_x, ext_y, ext_w, ext_h);
|
||||||
cp->col = dc->col.col;
|
cp->col = dc->col.col;
|
||||||
|
@ -1156,7 +1156,7 @@ static void
|
||||||
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
|
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
|
||||||
{
|
{
|
||||||
RGBA_Image *im = image;
|
RGBA_Image *im = image;
|
||||||
if (!im) return ;
|
if (!im) return;
|
||||||
|
|
||||||
#ifdef EVAS_CSERVE2
|
#ifdef EVAS_CSERVE2
|
||||||
if (evas_cserve2_use_get())
|
if (evas_cserve2_use_get())
|
||||||
|
@ -1177,7 +1177,7 @@ eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *tar
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!im) return ;
|
if (!im) return;
|
||||||
evas_cache_image_preload_cancel(&im->cache_entry, target);
|
evas_cache_image_preload_cancel(&im->cache_entry, target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1623,7 +1623,7 @@ evas_software_image_map_draw(void *data, void *context, RGBA_Image *surface, RGB
|
||||||
if ((cpunum > 1))
|
if ((cpunum > 1))
|
||||||
{
|
{
|
||||||
evas_common_pipe_map_draw(im, surface, context, m, smooth, level);
|
evas_common_pipe_map_draw(im, surface, context, m, smooth, level);
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -35,8 +35,8 @@ _evas_image_png_read(png_structp png_ptr, png_bytep out, png_size_t count)
|
||||||
{
|
{
|
||||||
Evas_PNG_Info *epi = png_get_io_ptr(png_ptr);
|
Evas_PNG_Info *epi = png_get_io_ptr(png_ptr);
|
||||||
|
|
||||||
if (!epi) return ;
|
if (!epi) return;
|
||||||
if (epi->position == epi->length) return ;
|
if (epi->position == epi->length) return;
|
||||||
|
|
||||||
if (epi->position + count > epi->length) count = epi->length - epi->position;
|
if (epi->position + count > epi->length) count = epi->length - epi->position;
|
||||||
memcpy(out, epi->map + epi->position, count);
|
memcpy(out, epi->map + epi->position, count);
|
||||||
|
|
Loading…
Reference in New Issue