cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=72aca66f8d068631edf38911b1a44c44bf96793d
commit 72aca66f8d068631edf38911b1a44c44bf96793d Author: Cedric BAIL <[email protected]> Date: Mon Jul 14 12:54:02 2014 +0200 eina: win32 and linux version code are the same. Sharing code is better. --- src/lib/eina/eina_file.c | 51 -------------------------------------- src/lib/eina/eina_file_common.c | 55 +++++++++++++++++++++++++++++++++++++++++ src/lib/eina/eina_file_win32.c | 52 -------------------------------------- 3 files changed, 55 insertions(+), 103 deletions(-) diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c index 2850326..08e3a2d 100644 --- a/src/lib/eina/eina_file.c +++ b/src/lib/eina/eina_file.c @@ -418,57 +418,6 @@ slprintf(char *str, size_t size, const char *format, ...) * Global * *============================================================================*/ -Eina_Bool -eina_file_init(void) -{ - _eina_file_log_dom = eina_log_domain_register("eina_file", - EINA_LOG_COLOR_DEFAULT); - if (_eina_file_log_dom < 0) - { - EINA_LOG_ERR("Could not register log domain: eina_file"); - return EINA_FALSE; - } - - _eina_file_cache = eina_hash_string_djb2_new(NULL); - if (!_eina_file_cache) - { - ERR("Could not create cache."); - eina_log_domain_unregister(_eina_file_log_dom); - _eina_file_log_dom = -1; - return EINA_FALSE; - } - - eina_lock_new(&_eina_file_lock_cache); - - return EINA_TRUE; -} - -Eina_Bool -eina_file_shutdown(void) -{ - if (eina_hash_population(_eina_file_cache) > 0) - { - Eina_Iterator *it; - const char *key; - - it = eina_hash_iterator_key_new(_eina_file_cache); - EINA_ITERATOR_FOREACH(it, key) - { - Eina_File *f = eina_hash_find(_eina_file_cache, key); - ERR("File [%s] still open %i times !", key, f->refcount); - } - eina_iterator_free(it); - } - - eina_hash_free(_eina_file_cache); - - eina_lock_free(&_eina_file_lock_cache); - - eina_log_domain_unregister(_eina_file_log_dom); - _eina_file_log_dom = -1; - return EINA_TRUE; -} - static Eina_Bool _eina_file_mmap_faulty_one(void *addr, long page_size, Eina_File_Map *m) diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c index 6d0925e..a81c67e 100644 --- a/src/lib/eina/eina_file_common.c +++ b/src/lib/eina/eina_file_common.c @@ -960,3 +960,58 @@ eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path) return EINA_TRUE; } + +/*============================================================================* + * Global * + *============================================================================*/ + +Eina_Bool +eina_file_init(void) +{ + _eina_file_log_dom = eina_log_domain_register("eina_file", + EINA_LOG_COLOR_DEFAULT); + if (_eina_file_log_dom < 0) + { + EINA_LOG_ERR("Could not register log domain: eina_file"); + return EINA_FALSE; + } + + _eina_file_cache = eina_hash_string_djb2_new(NULL); + if (!_eina_file_cache) + { + ERR("Could not create cache."); + eina_log_domain_unregister(_eina_file_log_dom); + _eina_file_log_dom = -1; + return EINA_FALSE; + } + + eina_lock_new(&_eina_file_lock_cache); + + return EINA_TRUE; +} + +Eina_Bool +eina_file_shutdown(void) +{ + if (eina_hash_population(_eina_file_cache) > 0) + { + Eina_Iterator *it; + const char *key; + + it = eina_hash_iterator_key_new(_eina_file_cache); + EINA_ITERATOR_FOREACH(it, key) + { + Eina_File *f = eina_hash_find(_eina_file_cache, key); + ERR("File [%s] still open %i times !", key, f->refcount); + } + eina_iterator_free(it); + } + + eina_hash_free(_eina_file_cache); + + eina_lock_free(&_eina_file_lock_cache); + + eina_log_domain_unregister(_eina_file_log_dom); + _eina_file_log_dom = -1; + return EINA_TRUE; +} diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c index 5e6b8e3..c70c19c 100644 --- a/src/lib/eina/eina_file_win32.c +++ b/src/lib/eina/eina_file_win32.c @@ -391,58 +391,6 @@ _eina_file_map_close(Eina_File_Map *map) * @endcond */ -/*============================================================================* - * Global * - *============================================================================*/ - -Eina_Bool -eina_file_init(void) -{ - _eina_file_log_dom = eina_log_domain_register("eina_file", - EINA_LOG_COLOR_DEFAULT); - if (_eina_file_log_dom < 0) - { - EINA_LOG_ERR("Could not register log domain: eina_file"); - return EINA_FALSE; - } - - _eina_file_cache = eina_hash_string_djb2_new(NULL); - if (!_eina_file_cache) - { - ERR("Could not create cache."); - eina_log_domain_unregister(_eina_file_log_dom); - _eina_file_log_dom = -1; - return EINA_FALSE; - } - - eina_lock_new(&_eina_file_lock_cache); - - return EINA_TRUE; -} - -Eina_Bool -eina_file_shutdown(void) -{ - if (eina_hash_population(_eina_file_cache) > 0) - { - Eina_Iterator *it; - const char *key; - - it = eina_hash_iterator_key_new(_eina_file_cache); - EINA_ITERATOR_FOREACH(it, key) - ERR("File [%s] still open !", key); - eina_iterator_free(it); - } - - eina_hash_free(_eina_file_cache); - - eina_lock_free(&_eina_file_lock_cache); - - eina_log_domain_unregister(_eina_file_log_dom); - _eina_file_log_dom = -1; - return EINA_TRUE; -} - /* ================================================================ * * Simplified logic for portability layer with eina_file_common * --
