vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove goto's. Don't like em, don't need em, don't want em ;) 

E_FREE already sets pointer to NULL.
Fix shutdown order in certain places.



SVN revision: 56158
This commit is contained in:
Christopher Michael 2011-01-16 02:05:33 +00:00
parent bea2bf271d
commit 1892b52333
1 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/modules/illume2/e_mod_main.c
View File

@ -37,10 +37,27 @@ e_modapi_init(E_Module *m)
_e_illume_mod_dir = eina_stringshare_add(m->dir);
/* try to initialize the config subsystem */
if (!e_mod_illume_config_init()) goto err1;
if (!e_mod_illume_config_init())
{
/* clear module directory variable */
if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir);
_e_illume_mod_dir = NULL;
return NULL;
}
/* try to initialize the policy subsystem */
if (!e_mod_policy_init()) goto err2;
if (!e_mod_policy_init())
{
/* shutdown the config subsystem */
e_mod_illume_config_shutdown();
/* clear module directory variable */
if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir);
_e_illume_mod_dir = NULL;
return NULL;
}
/* initialize the keyboard subsystem */
e_mod_kbd_init();
@ -60,7 +77,25 @@ e_modapi_init(E_Module *m)
/* allocate enough zones */
zones = calloc(zcount, sizeof(Ecore_X_Window));
EINA_SAFETY_ON_NULL_GOTO(zones, err3);
if (!zones)
{
/* free the keyboard */
E_FREE(_e_illume_kbd);
/* shutdown quickpanel & kbd sub-systems */
e_mod_quickpanel_shutdown();
e_mod_kbd_shutdown();
/* shutdown the config subsystem */
e_mod_illume_config_shutdown();
/* clear module directory variable */
if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir);
_e_illume_mod_dir = NULL;
return NULL;
}
zcount = 0;
/* loop the zones and create quickpanels for each one */
@ -95,20 +130,6 @@ e_modapi_init(E_Module *m)
free(zones);
return m;
err3:
E_FREE(_e_illume_kbd);
_e_illume_kbd = NULL;
e_mod_quickpanel_shutdown();
e_mod_kbd_shutdown();
err2:
/* shutdown the config subsystem */
e_mod_illume_config_shutdown();
err1:
/* clear module directory variable */
if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir);
_e_illume_mod_dir = NULL;
return NULL;
}
EAPI int