enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

eo ptr ind: current_table -> _current_table

This commit is contained in:
Jérémy Zurcher 2013-05-17 09:23:00 +02:00
parent 3c2332f88f
commit 3e4127da52
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/eo/eo_ptr_indirection.c
View File

@ -222,7 +222,7 @@ typedef struct
static _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL }; static _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL };
/* Current table used for following allocations */ /* Current table used for following allocations */
static _Eo_Ids_Table *current_table = NULL; static _Eo_Ids_Table *_current_table = NULL;
/* Next generation to use when assigning a new entry to a Eo pointer */ /* Next generation to use when assigning a new entry to a Eo pointer */
Generation_Counter _eo_generation_counter = 0; Generation_Counter _eo_generation_counter = 0;
@ -336,14 +336,14 @@ _search_tables()
if (entry) if (entry)
{ {
/* Store table info into current table */ /* Store table info into current table */
current_table = table; _current_table = table;
return entry; return entry;
} }
} }
} }
ERR("no more available entries to store eo objects"); ERR("no more available entries to store eo objects");
current_table = NULL; _current_table = NULL;
return NULL; return NULL;
} }
@ -353,8 +353,8 @@ _eo_id_allocate(const _Eo *obj)
#ifdef HAVE_EO_ID #ifdef HAVE_EO_ID
_Eo_Id_Entry *entry = NULL; _Eo_Id_Entry *entry = NULL;
if (current_table) if (_current_table)
entry = _get_available_entry(current_table); entry = _get_available_entry(_current_table);
if (!entry) if (!entry)
{ {
@ -371,9 +371,9 @@ _eo_id_allocate(const _Eo *obj)
entry->ptr = (_Eo *)obj; entry->ptr = (_Eo *)obj;
entry->active = 1; entry->active = 1;
entry->generation = _eo_generation_counter; entry->generation = _eo_generation_counter;
PROTECT(current_table); PROTECT(_current_table);
return EO_COMPOSE_FINAL_ID(current_table->partial_id, return EO_COMPOSE_FINAL_ID(_current_table->partial_id,
(entry - current_table->entries), (entry - _current_table->entries),
entry->generation); entry->generation);
#else #else
return (Eo_Id)obj; return (Eo_Id)obj;
@ -439,7 +439,7 @@ _eo_free_ids_tables()
} }
_eo_ids_tables[mid_table_id] = NULL; _eo_ids_tables[mid_table_id] = NULL;
} }
current_table = NULL; _current_table = NULL;
} }
#ifdef EFL_DEBUG #ifdef EFL_DEBUG