enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

formatting 

SVN revision: 72474
This commit is contained in:
Mike Blumenkrantz 2012-06-19 12:20:33 +00:00
parent b331eececb
commit 9f58d105a9
1 changed files with 486 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/bin/e_main.c
View File

@ -36,35 +36,35 @@ static double t0, t1, t2;
* void (*__after_morecore_hook)(void);
*
static void my_init_hook(void);
static void my_free_hook(void *p, const void *caller);
static void my_init_hook(void);
static void my_free_hook(void *p, const void *caller);
static void (*old_free_hook)(void *ptr, const void *caller) = NULL;
void (*__free_hook)(void *ptr, const void *caller);
static void (*old_free_hook)(void *ptr, const void *caller) = NULL;
void (*__free_hook)(void *ptr, const void *caller);
void (*__malloc_initialize_hook) (void) = my_init_hook;
static void
my_init_hook(void)
{
void (*__malloc_initialize_hook) (void) = my_init_hook;
static void
my_init_hook(void)
{
old_free_hook = __free_hook;
__free_hook = my_free_hook;
}
}
//void *magicfree = NULL;
//void *magicfree = NULL;
static void
my_free_hook(void *p, const void *caller)
{
static void
my_free_hook(void *p, const void *caller)
{
__free_hook = old_free_hook;
// if ((p) && (p == magicfree))
// {
// printf("CAUGHT!!!!! %p ...\n", p);
// abort();
// }
// if ((p) && (p == magicfree))
// {
// printf("CAUGHT!!!!! %p ...\n", p);
// abort();
// }
free(p);
__free_hook = my_free_hook;
}
*/
}
*/
/* local function prototypes */
static void _e_main_shutdown(int errcode);
@ -99,15 +99,13 @@ static Eina_Bool inloop = EINA_FALSE;
static jmp_buf x_fatal_buff;
static int _e_main_lvl = 0;
static int (*_e_main_shutdown_func[MAX_LEVEL])(void);
static int(*_e_main_shutdown_func[MAX_LEVEL]) (void);
static Eina_List *_idle_before_list = NULL;
static Ecore_Idle_Enterer *_idle_before = NULL;
static Ecore_Idle_Enterer *_idle_after = NULL;
static Ecore_Idle_Enterer *_idle_flush = NULL;
/* external variables */
EAPI Eina_Bool e_precache_end = EINA_FALSE;
EAPI Eina_Bool x_fatal = EINA_FALSE;
@ -681,7 +679,8 @@ main(int argc, char **argv)
if ((locked) && ((!e_config->show_splash) && (!after_restart)))
e_desklock_show();
else if (waslocked) e_desklock_show();
else if (waslocked)
e_desklock_show();
if (e_config->show_splash)
e_init_status_set(_("Setup Message Bus"));
@ -1021,7 +1020,7 @@ main(int argc, char **argv)
/* FIXME: make safe to delete within a callback */
EAPI E_Before_Idler *
e_main_idler_before_add(int (*func) (void *data), void *data, int once)
e_main_idler_before_add(int (*func)(void *data), void *data, int once)
{
E_Before_Idler *eb;
@ -1275,7 +1274,7 @@ _e_main_dirs_init(void)
};
base = e_user_dir_get();
if (ecore_file_mksubdirs(base, dirs) != sizeof(dirs)/sizeof(dirs[0]) - 1)
if (ecore_file_mksubdirs(base, dirs) != sizeof(dirs) / sizeof(dirs[0]) - 1)
{
e_error_message_show("Could not create one of the required "
"subdirectories of '%s'", base);
@ -1773,7 +1772,7 @@ _e_main_cb_idle_before(void *data __UNUSED__)
if (!eb->func(eb->data)) eb->delete_me = 1;
}
}
EINA_LIST_FOREACH_SAFE(_idle_before_list, pl, l, eb)
EINA_LIST_FOREACH_SAFE (_idle_before_list, pl, l, eb)
{
if ((eb->once) || (eb->delete_me))
{
@ -1817,3 +1816,4 @@ _e_main_cb_startup_fake_end(void *data __UNUSED__)
e_init_hide();
return ECORE_CALLBACK_CANCEL;
}