raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e146371ed932e51844c9ecaa9a0a03d095b8a525
commit e146371ed932e51844c9ecaa9a0a03d095b8a525 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Nov 12 09:32:59 2016 +0900 evas modules - only unregister log domain if its registered some modules did check, some didnt... but this makes them consistent and silences and eina err log. :) --- src/modules/evas/engines/buffer/evas_engine.c | 6 +++++- src/modules/evas/engines/drm/evas_engine.c | 6 +++++- src/modules/evas/engines/eglfs/evas_engine.c | 7 +++++-- src/modules/evas/engines/fb/evas_engine.c | 6 +++++- src/modules/evas/engines/gl_drm/evas_engine.c | 7 +++++-- src/modules/evas/engines/gl_generic/evas_engine.c | 6 +++++- src/modules/evas/engines/gl_sdl/evas_engine.c | 6 +++++- src/modules/evas/engines/gl_x11/evas_engine.c | 6 +++++- src/modules/evas/engines/psl1ght/evas_engine.c | 6 +++++- src/modules/evas/engines/software_ddraw/evas_engine.c | 6 +++++- src/modules/evas/engines/software_gdi/evas_engine.c | 7 +++++-- src/modules/evas/engines/software_generic/evas_engine.c | 6 +++++- src/modules/evas/engines/software_x11/evas_engine.c | 6 +++++- src/modules/evas/engines/wayland_egl/evas_engine.c | 6 +++++- src/modules/evas/engines/wayland_shm/evas_engine.c | 10 +++++----- src/modules/evas/image_loaders/ico/evas_image_load_ico.c | 6 +++++- src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c | 7 +++++-- src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c | 6 +++++- src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c | 6 +++++- 19 files changed, 95 insertions(+), 27 deletions(-) diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c index bef4a45..5ee45dc 100644 --- a/src/modules/evas/engines/buffer/evas_engine.c +++ b/src/modules/evas/engines/buffer/evas_engine.c @@ -224,7 +224,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_buffer_log_dom); + if (_evas_engine_buffer_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_buffer_log_dom); + _evas_engine_buffer_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index d712093..f709592 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -172,7 +172,11 @@ static void module_close(Evas_Module *em EINA_UNUSED) { /* unregister the eina log domain for this engine */ - eina_log_domain_unregister(_evas_engine_drm_log_dom); + if (_evas_engine_drm_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_drm_log_dom); + _evas_engine_drm_log_dom = -1; + } ecore_shutdown(); } diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c index c881f29..abd2c4b 100644 --- a/src/modules/evas/engines/eglfs/evas_engine.c +++ b/src/modules/evas/engines/eglfs/evas_engine.c @@ -1234,8 +1234,11 @@ static void module_close(Evas_Module *em EINA_UNUSED) { /* unregister the eina log domain for this engine */ - eina_log_domain_unregister(_evas_engine_eglfs_log_dom); - _evas_engine_eglfs_log_dom = -1; + if (_evas_engine_eglfs_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_eglfs_log_dom); + _evas_engine_eglfs_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c index 3156b95..204a614 100644 --- a/src/modules/evas/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -235,7 +235,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_fb_log_dom); + if (_evas_engine_fb_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_fb_log_dom); + _evas_engine_fb_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index ae19d1a..144dcbd 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -1467,8 +1467,11 @@ static void module_close(Evas_Module *em EINA_UNUSED) { /* unregister the eina log domain for this engine */ - eina_log_domain_unregister(_evas_engine_gl_drm_log_dom); - _evas_engine_gl_drm_log_dom = -1; + if (_evas_engine_gl_drm_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_gl_drm_log_dom); + _evas_engine_gl_drm_log_dom = -1; + } ecore_shutdown(); } diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index 899a2a7..8cff9b9 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -3262,7 +3262,11 @@ static void module_close(Evas_Module *em EINA_UNUSED) { ector_shutdown(); - eina_log_domain_unregister(_evas_engine_GL_log_dom); + if (_evas_engine_GL_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_GL_log_dom); + _evas_engine_GL_log_dom = -1; + } evas_gl_common_module_close(); } diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c index 1a43ae5..e722eee 100644 --- a/src/modules/evas/engines/gl_sdl/evas_engine.c +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c @@ -423,7 +423,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_GL_SDL_log_dom); + if (_evas_engine_GL_SDL_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_GL_SDL_log_dom); + _evas_engine_GL_SDL_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 2d4fde9..49d192e 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -3184,7 +3184,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_GL_X11_log_dom); + if (_evas_engine_GL_X11_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_GL_X11_log_dom); + _evas_engine_GL_X11_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c index 1d9ec1e..be5f808 100644 --- a/src/modules/evas/engines/psl1ght/evas_engine.c +++ b/src/modules/evas/engines/psl1ght/evas_engine.c @@ -482,7 +482,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_psl1ght_log_dom); + if (_evas_engine_psl1ght_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_psl1ght_log_dom); + _evas_engine_psl1ght_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c index 75b37ba..3d6834c 100644 --- a/src/modules/evas/engines/software_ddraw/evas_engine.c +++ b/src/modules/evas/engines/software_ddraw/evas_engine.c @@ -186,7 +186,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_log_dom_module); + if (_evas_log_dom_module >= 0) + { + eina_log_domain_unregister(_evas_log_dom_module); + _evas_log_dom_module = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c index d57e92c..be226f7 100644 --- a/src/modules/evas/engines/software_gdi/evas_engine.c +++ b/src/modules/evas/engines/software_gdi/evas_engine.c @@ -195,8 +195,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_soft_gdi_log_dom); - _evas_engine_soft_gdi_log_dom = -1; + if (_evas_engine_soft_gdi_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_soft_gdi_log_dom); + _evas_engine_soft_gdi_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 66a2d0b..baf3e46 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -5878,7 +5878,11 @@ module_close(Evas_Module *em EINA_UNUSED) eina_mempool_del(_mp_command_font); eina_mempool_del(_mp_command_map); eina_mempool_del(_mp_command_ector); - eina_log_domain_unregister(_evas_soft_gen_log_dom); + if (_evas_soft_gen_log_dom >= 0) + { + eina_log_domain_unregister(_evas_soft_gen_log_dom); + _evas_soft_gen_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 6ef80b4..fd61bc0 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -682,7 +682,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_soft_x11_log_dom); + if (_evas_engine_soft_x11_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_soft_x11_log_dom); + _evas_engine_soft_x11_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 94c4316..64bed02 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -1423,7 +1423,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_engine_wl_egl_log_dom); + if (_evas_engine_wl_egl_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_wl_egl_log_dom); + _evas_engine_wl_egl_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 1fe45ec..b00c614 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -415,11 +415,11 @@ module_close(Evas_Module *em EINA_UNUSED) LOGFN(__FILE__, __LINE__, __FUNCTION__); /* unregister logging domain */ - if (_evas_engine_way_shm_log_dom > -1) - eina_log_domain_unregister(_evas_engine_way_shm_log_dom); - - /* reset logging domain variable */ - _evas_engine_way_shm_log_dom = -1; + if (_evas_engine_way_shm_log_dom >= 0) + { + eina_log_domain_unregister(_evas_engine_way_shm_log_dom); + _evas_engine_way_shm_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c index 7645f2a..4f7363d 100644 --- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c +++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c @@ -823,7 +823,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_loader_ico_log_dom); + if (_evas_loader_ico_log_dom >= 0) + { + eina_log_domain_unregister(_evas_loader_ico_log_dom); + _evas_loader_ico_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c index b20414b..a4ed273 100644 --- a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c +++ b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c @@ -392,8 +392,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_loader_jp2k_log_dom); - _evas_loader_jp2k_log_dom = -1; + if (_evas_loader_jp2k_log_dom >= 0) + { + eina_log_domain_unregister(_evas_loader_jp2k_log_dom); + _evas_loader_jp2k_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c index 943c3e7..19b9aac 100644 --- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c +++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c @@ -359,7 +359,11 @@ module_open(Evas_Module *em) static void module_close(Evas_Module *em EINA_UNUSED) { - eina_log_domain_unregister(_evas_loader_tiff_log_dom); + if (_evas_loader_tiff_log_dom >= 0) + { + eina_log_domain_unregister(_evas_loader_tiff_log_dom); + _evas_loader_tiff_log_dom = -1; + } } static Evas_Module_Api evas_modapi = diff --git a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c index cf9b9df..4957956 100644 --- a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c +++ b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c @@ -726,7 +726,11 @@ module_close(Evas_Module *em EINA_UNUSED) eina_file_close(rgb_txt); rgb_txt = NULL; } - eina_log_domain_unregister(_evas_loader_xpm_log_dom); + if (_evas_loader_xpm_log_dom >= 0) + { + eina_log_domain_unregister(_evas_loader_xpm_log_dom); + _evas_loader_xpm_log_dom = -1; + } } static Evas_Module_Api evas_modapi = --
