enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

greatly simplify eeze_init/shutdown by moving disk stuff to eeze_disk.c 

SVN revision: 59567
This commit is contained in:
Mike Blumenkrantz 2011-05-21 19:34:26 +00:00
parent e1e525ae19
commit 1c79e6a54d
3 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/eeze/src/lib/eeze_disk.c
View File

@ -9,6 +9,7 @@
#include "eeze_udev_private.h"
#include "eeze_disk_private.h"
int _eeze_disk_log_dom = -1;
Eina_List *_eeze_disks = NULL;
static Eeze_Disk_Type
@ -94,6 +95,41 @@ _eeze_disk_device_from_property(const char *prop, Eina_Bool uuid)
}
void
eeze_disk_shutdown(void)
{
eeze_mount_shutdown();
ecore_file_shutdown();
eina_log_domain_unregister(_eeze_disk_log_dom);
_eeze_disk_log_dom = -1;
}
Eina_Bool
eeze_disk_init(void)
{
_eeze_disk_log_dom = eina_log_domain_register("eeze_disk", EINA_COLOR_LIGHTBLUE);
if (_eeze_disk_log_dom < 0)
{
EINA_LOG_ERR("Could not register 'eeze_disk' log domain.");
goto disk_fail;
}
if (!ecore_file_init())
goto disk_fail;
if (!eeze_mount_init())
goto ecore_file_fail;
return EINA_TRUE;
ecore_file_fail:
ecore_file_shutdown();
disk_fail:
eina_log_domain_unregister(_eeze_disk_log_dom);
_eeze_disk_log_dom = -1;
return EINA_FALSE;
}
EAPI void
eeze_disk_function(void)
{

3
legacy/eeze/src/lib/eeze_disk_private.h
View File

@ -73,6 +73,9 @@ struct _Eeze_Disk
} cache;
};
Eina_Bool eeze_disk_init(void);
void eeze_disk_shutdown(void);
Eina_Bool eeze_mount_init(void);
void eeze_mount_shutdown(void);

44
legacy/eeze/src/lib/eeze_main.c
View File

@ -11,9 +11,6 @@
_udev *udev;
int _eeze_udev_log_dom = -1;
#ifdef HAVE_EEZE_MOUNT
int _eeze_disk_log_dom = -1;
#endif
int _eeze_init_count = 0;
static Eeze_Version _version = { VMAJ, VMIN, VMIC, VREV };
@ -40,45 +37,23 @@ eeze_init(void)
if (!ecore_init())
goto fail;
#ifdef HAVE_EEZE_MOUNT
_eeze_disk_log_dom = eina_log_domain_register("eeze_disk", EINA_COLOR_LIGHTBLUE);
if (_eeze_disk_log_dom < 0)
{
EINA_LOG_ERR("Could not register 'eeze_disk' log domain.");
goto disk_fail;
}
if (!ecore_file_init())
goto ecore_fail;
if (!eeze_mount_init())
goto ecore_file_fail;
if (!eeze_disk_init())
goto eeze_fail;
#endif
if (!((udev) = udev_new()))
{
EINA_LOG_ERR("Could not initialize udev library!");
#ifdef HAVE_EEZE_MOUNT
goto eeze_fail;
#else
goto ecore_fail;
#endif
}
return _eeze_init_count;
#ifdef HAVE_EEZE_MOUNT
eeze_fail:
eeze_mount_shutdown();
ecore_file_fail:
ecore_file_shutdown();
#endif
ecore_fail:
ecore_shutdown();
#ifdef HAVE_EEZE_MOUNT
disk_fail:
eina_log_domain_unregister(_eeze_disk_log_dom);
_eeze_disk_log_dom = -1;
eeze_disk_shutdown();
eeze_fail:
#endif
ecore_shutdown();
fail:
eina_log_domain_unregister(_eeze_udev_log_dom);
_eeze_udev_log_dom = -1;
@ -95,14 +70,9 @@ eeze_shutdown(void)
udev_unref(udev);
#ifdef HAVE_EEZE_MOUNT
eeze_mount_shutdown();
ecore_file_shutdown();
ecore_shutdown();
eina_log_domain_unregister(_eeze_disk_log_dom);
_eeze_disk_log_dom = -1;
#else
ecore_shutdown();
eeze_disk_shutdown();
#endif
ecore_shutdown();
eina_log_domain_unregister(_eeze_udev_log_dom);
_eeze_udev_log_dom = -1;
eina_shutdown();