summaryrefslogtreecommitdiff
path: root/src/lib/eo/eo_ptr_indirection.c
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-05-17 09:23:00 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2013-05-17 09:23:00 +0200
commit3e4127da524d0aee2bbad7cdd12fbd48dc723355 (patch)
treed6d15b5211220221721c9fa08116a8d3cb801b72 /src/lib/eo/eo_ptr_indirection.c
parent3c2332f88fd8fb7a76b0049e78cc6df962644eb4 (diff)
eo ptr ind: current_table -> _current_table
Diffstat (limited to 'src/lib/eo/eo_ptr_indirection.c')
-rw-r--r--src/lib/eo/eo_ptr_indirection.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/eo/eo_ptr_indirection.c b/src/lib/eo/eo_ptr_indirection.c
index 9afa175..bb466da 100644
--- a/src/lib/eo/eo_ptr_indirection.c
+++ b/src/lib/eo/eo_ptr_indirection.c
@@ -222,7 +222,7 @@ typedef struct
222static _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL }; 222static _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL };
223 223
224/* Current table used for following allocations */ 224/* Current table used for following allocations */
225static _Eo_Ids_Table *current_table = NULL; 225static _Eo_Ids_Table *_current_table = NULL;
226 226
227/* Next generation to use when assigning a new entry to a Eo pointer */ 227/* Next generation to use when assigning a new entry to a Eo pointer */
228Generation_Counter _eo_generation_counter = 0; 228Generation_Counter _eo_generation_counter = 0;
@@ -336,14 +336,14 @@ _search_tables()
336 if (entry) 336 if (entry)
337 { 337 {
338 /* Store table info into current table */ 338 /* Store table info into current table */
339 current_table = table; 339 _current_table = table;
340 return entry; 340 return entry;
341 } 341 }
342 } 342 }
343 } 343 }
344 344
345 ERR("no more available entries to store eo objects"); 345 ERR("no more available entries to store eo objects");
346 current_table = NULL; 346 _current_table = NULL;
347 return NULL; 347 return NULL;
348} 348}
349 349
@@ -353,8 +353,8 @@ _eo_id_allocate(const _Eo *obj)
353#ifdef HAVE_EO_ID 353#ifdef HAVE_EO_ID
354 _Eo_Id_Entry *entry = NULL; 354 _Eo_Id_Entry *entry = NULL;
355 355
356 if (current_table) 356 if (_current_table)
357 entry = _get_available_entry(current_table); 357 entry = _get_available_entry(_current_table);
358 358
359 if (!entry) 359 if (!entry)
360 { 360 {
@@ -371,9 +371,9 @@ _eo_id_allocate(const _Eo *obj)
371 entry->ptr = (_Eo *)obj; 371 entry->ptr = (_Eo *)obj;
372 entry->active = 1; 372 entry->active = 1;
373 entry->generation = _eo_generation_counter; 373 entry->generation = _eo_generation_counter;
374 PROTECT(current_table); 374 PROTECT(_current_table);
375 return EO_COMPOSE_FINAL_ID(current_table->partial_id, 375 return EO_COMPOSE_FINAL_ID(_current_table->partial_id,
376 (entry - current_table->entries), 376 (entry - _current_table->entries),
377 entry->generation); 377 entry->generation);
378#else 378#else
379 return (Eo_Id)obj; 379 return (Eo_Id)obj;
@@ -439,7 +439,7 @@ _eo_free_ids_tables()
439 } 439 }
440 _eo_ids_tables[mid_table_id] = NULL; 440 _eo_ids_tables[mid_table_id] = NULL;
441 } 441 }
442 current_table = NULL; 442 _current_table = NULL;
443} 443}
444 444
445#ifdef EFL_DEBUG 445#ifdef EFL_DEBUG