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

eio: fix coding style of Eio_Model.

This commit is contained in:
Cedric BAIL 2015-04-05 15:19:53 +02:00
parent 92be4f9c89
commit 23cfd2b4f4
1 changed files with 117 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lib/eio/eio_model.c
View File

@ -150,14 +150,14 @@ _eio_prop_set_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, in
* Ecore Events
*/
static Eina_Bool
_emodel_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
_emodel_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
{
Eio_Monitor_Event *evt = (Eio_Monitor_Event*)event;
Eio_Model_Data *priv = data;
Emodel_Children_Event cevt;
Eina_Value path;
if(priv->children_list)
if (priv->children_list)
{
cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(evt->filename));
priv->children_list = eina_list_append(priv->children_list, cevt.child);
@ -180,17 +180,19 @@ _emodel_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
Eio_Monitor_Event *evt = (Eio_Monitor_Event*)event;
Eio_Model_Data *priv = data;
if(priv->children_list)
if (priv->children_list)
{
Eina_List* cur = priv->children_list;
int i;
for(i = 0; cur; ++i, cur = cur->next)
for (i = 0; cur; ++i, cur = cur->next)
{
Eio_Model_Data *cur_priv = eo_data_scope_get(cur->data, MY_CLASS);
if(strcmp(cur_priv->path, evt->filename) == 0)
break;
}
if(cur)
if (cur)
{
Emodel_Children_Event cevt;
cevt.index = i;
@ -266,11 +268,13 @@ _eio_model_emodel_properties_list_get(Eo *obj EINA_UNUSED,
EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(priv->obj, EINA_FALSE);
if(priv->properties_array == NULL)
if (priv->properties_array == NULL)
{
Eina_Value_Struct_Desc *desc = EIO_MODEL_PROPERTIES_DESC;
priv->properties_array = eina_array_new(desc->member_count);
for(i = 0; i < desc->member_count; ++i)
for (i = 0; i < desc->member_count; ++i)
eina_array_push(priv->properties_array, desc->members[i].name);
}
@ -351,7 +355,7 @@ _eio_model_emodel_children_count_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
/**
* Properties Load
*/
static void
static void
_eio_model_emodel_properties_load(Eo *obj EINA_UNUSED, Eio_Model_Data *priv)
{
if (priv->path == NULL)
@ -371,14 +375,16 @@ _eio_model_emodel_properties_load(Eo *obj EINA_UNUSED, Eio_Model_Data *priv)
static void
_eio_model_emodel_monitor_add(Eio_Model_Data *priv)
{
if(!priv->monitor)
if (!priv->monitor)
{
priv->monitor = eio_monitor_add(priv->path);
int i = 0;
for(i = 0; priv->mon.mon_event_child_add[i] != EIO_MONITOR_ERROR ; ++i)
for (i = 0; priv->mon.mon_event_child_add[i] != EIO_MONITOR_ERROR ; ++i)
priv->mon.ecore_child_add_handler[i] =
ecore_event_handler_add(priv->mon.mon_event_child_add[i], _emodel_evt_added_ecore_cb, priv);
for(i = 0; priv->mon.mon_event_child_del[i] != EIO_MONITOR_ERROR ; ++i)
for (i = 0; priv->mon.mon_event_child_del[i] != EIO_MONITOR_ERROR ; ++i)
priv->mon.ecore_child_add_handler[i] =
ecore_event_handler_add(priv->mon.mon_event_child_del[i], _emodel_evt_deleted_ecore_cb, priv);
}
@ -471,7 +477,7 @@ _eio_model_emodel_children_load(Eo *obj EINA_UNUSED, Eio_Model_Data *priv)
/**
* Load
*/
static void
static void
_eio_model_emodel_load(Eo *obj, Eio_Model_Data *priv)
{
priv->load_pending |= EMODEL_LOAD_STATUS_LOADED_CHILDREN;
@ -555,8 +561,10 @@ _eio_model_emodel_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *child
child_priv = eo_data_scope_get(child, MY_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(child_priv, EMODEL_LOAD_STATUS_ERROR);
eio_file_direct_stat(child_priv->path, &_eio_model_emodel_child_del_stat
, &_eio_error_unlink_cb, child);
eio_file_direct_stat(child_priv->path,
&_eio_model_emodel_child_del_stat,
&_eio_error_unlink_cb,
child);
eo_ref(child);
return priv->load.status;
}
@ -577,7 +585,7 @@ _eio_model_emodel_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
* and parameter is set to NULL.
*/
if(!(priv->load.status & EMODEL_LOAD_STATUS_LOADED_CHILDREN))
if (!(priv->load.status & EMODEL_LOAD_STATUS_LOADED_CHILDREN))
{
/**
* Status should be in either unloaded state or unitialized
@ -587,7 +595,7 @@ _eio_model_emodel_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
return priv->load.status;
}
if((start == 0) && (count == 0)) /* this is full data */
if ((start == 0) && (count == 0)) /* this is full data */
{
/*
* children_accessor will be set to NULL by
@ -598,15 +606,13 @@ _eio_model_emodel_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
else /* this is only slice */
{
ln = eina_list_nth_list(priv->children_list, (start-1));
if(!ln)
if (!ln)
{
/**
* In error, we make it more verbose
* by forcing warning to be displayed on terminal.
*/
*children_accessor = NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(NULL, priv->load.status);
ERR("children not found !");
return priv->load.status;
}
EINA_LIST_FOREACH(ln, l, child)
{
eo_ref(child);
@ -614,6 +620,7 @@ _eio_model_emodel_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *priv,
if (eina_list_count(lr) == count)
break;
}
// This may leak the children Eina_List.
*children_accessor = eina_list_accessor_new(lr);
}
@ -691,7 +698,7 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
{
Eo *child;
if(priv->monitor)
if (priv->monitor)
eio_monitor_del(priv->monitor);
if (priv->properties_array)