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. :)
This commit is contained in:
Carsten Haitzler 2016-11-12 09:32:59 +09:00
parent a5489d322b
commit e146371ed9
19 changed files with 95 additions and 27 deletions

View File

@ -223,8 +223,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -172,7 +172,11 @@ static void
module_close(Evas_Module *em EINA_UNUSED)
{
/* unregister the eina log domain for this engine */
if (_evas_engine_drm_log_dom >= 0)
{
eina_log_domain_unregister(_evas_engine_drm_log_dom);
_evas_engine_drm_log_dom = -1;
}
ecore_shutdown();
}

View File

@ -1234,9 +1234,12 @@ static void
module_close(Evas_Module *em EINA_UNUSED)
{
/* unregister the eina log domain for this engine */
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 =
{

View File

@ -234,8 +234,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -1467,8 +1467,11 @@ static void
module_close(Evas_Module *em EINA_UNUSED)
{
/* unregister the eina log domain for this engine */
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();
}

View File

@ -3262,7 +3262,11 @@ static void
module_close(Evas_Module *em EINA_UNUSED)
{
ector_shutdown();
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();
}

View File

@ -422,8 +422,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -3183,8 +3183,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -481,8 +481,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -185,8 +185,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -194,10 +194,13 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =
{

View File

@ -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);
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 =

View File

@ -681,8 +681,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -1422,8 +1422,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -415,12 +415,12 @@ module_close(Evas_Module *em EINA_UNUSED)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
/* unregister logging domain */
if (_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);
/* reset logging domain variable */
_evas_engine_way_shm_log_dom = -1;
}
}
static Evas_Module_Api evas_modapi =
{

View File

@ -822,8 +822,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -391,10 +391,13 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =
{

View File

@ -358,8 +358,12 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
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 =

View File

@ -726,7 +726,11 @@ module_close(Evas_Module *em EINA_UNUSED)
eina_file_close(rgb_txt);
rgb_txt = NULL;
}
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 =